sound fixes for Ferrari GP

[picodrive.git] / Pico / sound / sound.c

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 7d41860..ac37c61 100644 (file)
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -117,7 +117,7 @@ PICO_INTERNAL void sound_reset(void)
 // to be called after changing sound rate or chips\r
 void sound_rerate(int preserve_state)\r
 {\r
-  unsigned int state[28];\r
+  void *state = NULL;\r
   int target_fps = Pico.m.pal ? 50 : 60;\r
 \r
   // not all rates are supported in MCD mode due to mp3 decoder limitations\r
@@ -127,12 +127,16 @@ void sound_rerate(int preserve_state)
   }\r
 \r
   if (preserve_state) {\r
+    state = malloc(0x200);\r
+    if (state == NULL) return;\r
+    memcpy(state, YM2612GetRegs(), 0x200);\r
     if ((PicoMCD & 1) && Pico_mcd->m.audio_track)\r
       Pico_mcd->m.audio_offset = mp3_get_offset();\r
   }\r
   YM2612Init(Pico.m.pal ? OSC_PAL/7 : OSC_NTSC/7, PsndRate);\r
   if (preserve_state) {\r
     // feed it back it's own registers, just like after loading state\r
+    memcpy(YM2612GetRegs(), state, 0x200);\r
     YM2612PicoStateLoad();\r
     if ((PicoMCD & 1) && Pico_mcd->m.audio_track)\r
       mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);\r
@@ -142,6 +146,9 @@ void sound_rerate(int preserve_state)
   SN76496_init(Pico.m.pal ? OSC_PAL/15 : OSC_NTSC/15, PsndRate);\r
   if (preserve_state) memcpy(sn76496_regs, state, 28*4); // restore old state\r
 \r
+  if (state)\r
+    free(state);\r
+\r
   // calculate PsndLen\r
   PsndLen=PsndRate / target_fps;\r
   PsndLen_exc_add=((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r