From 7b2ad6a1f878178214f432a065089a121b0dd974 Mon Sep 17 00:00:00 2001 From: pjgat09 Date: Sat, 11 May 2013 15:34:07 +0000 Subject: [PATCH] N64: Fixed a bug with saving/loading a state before the first frame, causing the audio frequency to be very wrong, and breaking the resampler --- .../output/dll/mupen64plus-audio-bkm.dll | Bin 13824 -> 40960 bytes libmupen64plus/mupen64plus-audio-bkm/main.c | 31 +++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/BizHawk.MultiClient/output/dll/mupen64plus-audio-bkm.dll b/BizHawk.MultiClient/output/dll/mupen64plus-audio-bkm.dll index a35acc1b0ce38ed32d7dbef5daf12566db59109f..ca65324b9f338c7ac14fea3e37d1c5fb32774072 100644 GIT binary patch literal 40960 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 Q4}0vL^mYrPe<#oX1f|Y&RR910 diff --git a/libmupen64plus/mupen64plus-audio-bkm/main.c b/libmupen64plus/mupen64plus-audio-bkm/main.c index f6c83ff798..815713e9ca 100644 --- a/libmupen64plus/mupen64plus-audio-bkm/main.c +++ b/libmupen64plus/mupen64plus-audio-bkm/main.c @@ -319,18 +319,25 @@ EXPORT void CALL AiDacrateChanged( int SystemType ) if (!l_PluginInit) return; - switch (SystemType) - { - case SYSTEM_NTSC: - f = 48681812 / (*AudioInfo.AI_DACRATE_REG + 1); - break; - case SYSTEM_PAL: - f = 49656530 / (*AudioInfo.AI_DACRATE_REG + 1); - break; - case SYSTEM_MPAL: - f = 48628316 / (*AudioInfo.AI_DACRATE_REG + 1); - break; - } + if (*AudioInfo.AI_DACRATE_REG == 0) + { + f = DEFAULT_FREQUENCY; + } + else + { + switch (SystemType) + { + case SYSTEM_NTSC: + f = 48681812 / (*AudioInfo.AI_DACRATE_REG + 1); + break; + case SYSTEM_PAL: + f = 49656530 / (*AudioInfo.AI_DACRATE_REG + 1); + break; + case SYSTEM_MPAL: + f = 48628316 / (*AudioInfo.AI_DACRATE_REG + 1); + break; + } + } InitializeAudio(f); }