diff --git a/Frameworks/libsidplay/libsidplay/config.h b/Frameworks/libsidplay/libsidplay/config.h index 1ce633e84..0ed26331f 100644 --- a/Frameworks/libsidplay/libsidplay/config.h +++ b/Frameworks/libsidplay/libsidplay/config.h @@ -12,7 +12,7 @@ #define HAVE_STRNCASECMP 1 #define PACKAGE_NAME "reSIDfp" -#define PACKAGE_VERSION "2.0.0alpha" +#define PACKAGE_VERSION "2.0.1" #define PACKAGE_URL "http://sourceforge.net/projects/sidplay-residfp/" #endif diff --git a/Frameworks/libsidplay/libsidplay/residfp/siddefs-fp.h b/Frameworks/libsidplay/libsidplay/residfp/siddefs-fp.h index 5df6fc443..8d0ca36aa 100644 --- a/Frameworks/libsidplay/libsidplay/residfp/siddefs-fp.h +++ b/Frameworks/libsidplay/libsidplay/residfp/siddefs-fp.h @@ -51,11 +51,11 @@ extern "C" #ifndef __VERSION_CC__ extern const char* residfp_version_string; #else -const char* residfp_version_string = "2.0.0alpha"; +const char* residfp_version_string = "2.0.1"; #endif } -#define VERSION "2.0.0alpha" +#define VERSION "2.0.1" // Inlining on/off. #define RESID_INLINING 1 diff --git a/Frameworks/libsidplay/libsidplay/sidplayfp/sidversion.h b/Frameworks/libsidplay/libsidplay/sidplayfp/sidversion.h index 8e244416b..399360683 100644 --- a/Frameworks/libsidplay/libsidplay/sidplayfp/sidversion.h +++ b/Frameworks/libsidplay/libsidplay/sidplayfp/sidversion.h @@ -9,7 +9,7 @@ #define LIBSIDPLAYFP_VERSION_MAJ "2" #define LIBSIDPLAYFP_VERSION_MIN "0" -#define LIBSIDPLAYFP_VERSION_LEV "0alpha" +#define LIBSIDPLAYFP_VERSION_LEV "1" #endif diff --git a/Frameworks/libsidplay/sidplay-residfp-code b/Frameworks/libsidplay/sidplay-residfp-code index 5beb0a91d..0d486884c 160000 --- a/Frameworks/libsidplay/sidplay-residfp-code +++ b/Frameworks/libsidplay/sidplay-residfp-code @@ -1 +1 @@ -Subproject commit 5beb0a91d0fa566ec1b4d125cbe53831833c6692 +Subproject commit 0d486884c880470e43d73d318492d9176daf046a diff --git a/Plugins/sidplay/SidDecoder.mm b/Plugins/sidplay/SidDecoder.mm index 7a3fb90f9..e7fd02b09 100755 --- a/Plugins/sidplay/SidDecoder.mm +++ b/Plugins/sidplay/SidDecoder.mm @@ -43,7 +43,7 @@ const SidTuneInfo * info = tune->getInfo(); - n_channels = info->sidChips(); + n_channels = 2; length = 3 * 60 * 44100; @@ -75,7 +75,7 @@ SidConfig conf = engine->config(); conf.frequency = 44100; - conf.playback = (info->sidChips() > 1) ? SidConfig::STEREO : SidConfig::MONO; + conf.playback = SidConfig::STEREO; conf.sidEmulation = builder; if (!engine->config(conf)) return NO; @@ -116,6 +116,14 @@ if (rendered <= 0) break; + for (int i = 0; i < rendered; i += 2) { + int16_t * sample = sampleBuffer + total * 2 + i; + int mid = (sample[0] + sample[1]) / 2; + int side = (sample[0] - sample[1]) / 4; + sample[0] = mid + side; + sample[1] = mid - side; + } + renderedTotal += rendered; if ( !IsRepeatOneSet() && renderedTotal >= length ) {