fast mode timing changed (again...)

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

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 1a7604f..8bec0ba 100644 (file)
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -106,9 +106,7 @@ PICO_INTERNAL void sound_reset(void)
   // also clear the internal registers+addr line\r
   ym2612_regs = YM2612GetRegs();\r
   memset(ym2612_regs, 0, 0x200+4);\r
-  // setting these to 0 might confuse timing code,\r
-  // so better set to something like this instead\r
-  z80startCycle = z80stopCycle = 0x01000000;\r
+  z80startCycle = z80stopCycle = 0;\r
 \r
   sound_rerate(0);\r
 }\r
@@ -262,7 +260,8 @@ PICO_INTERNAL int sound_render(int offset, int length)
   }\r
 \r
   // CD: CDDA audio\r
-  if ((PicoMCD & 1) && (PicoOpt & 0x800))\r
+  // CD mode, cdda enabled, not data track, CDC is reading\r
+  if ((PicoMCD & 1) && (PicoOpt & 0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
     mp3_update(buf32, length, stereo);\r
 \r
   // convert + limit to normal 16bit output\r