work on 'vblank on line start' problem, var changes, mask defines

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

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 64e172a..6658548 100644 (file)
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -110,16 +110,16 @@ void PsndRerate(int preserve_state)
   int target_fps = Pico.m.pal ? 50 : 60;\r
 \r
   // not all rates are supported in MCD mode due to mp3 decoder limitations\r
-  if (PicoMCD & 1) {\r
+  if (PicoAHW & PAHW_MCD) {\r
     if (PsndRate != 11025 && PsndRate != 22050 && PsndRate != 44100) PsndRate = 22050;\r
-    PicoOpt |= 8; // force stereo\r
+    PicoOpt |= POPT_EN_STEREO; // force stereo\r
   }\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
+    if ((PicoAHW & PAHW_MCD) && 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
@@ -127,7 +127,7 @@ void PsndRerate(int preserve_state)
     // 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
+    if ((PicoAHW & PAHW_MCD) && 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
   }\r
 \r
@@ -146,7 +146,7 @@ void PsndRerate(int preserve_state)
   // recalculate dac info\r
   dac_recalculate();\r
 \r
-  if (PicoMCD & 1)\r
+  if (PicoAHW & PAHW_MCD)\r
     pcm_set_rate(PsndRate);\r
 \r
   // clear all buffers\r
@@ -155,7 +155,7 @@ void PsndRerate(int preserve_state)
     PsndClear();\r
 \r
   // set mixer\r
-  PsndMix_32_to_16l = (PicoOpt & 8) ? mix_32_to_16l_stereo : mix_32_to_16_mono;\r
+  PsndMix_32_to_16l = (PicoOpt & POPT_EN_STEREO) ? mix_32_to_16l_stereo : mix_32_to_16_mono;\r
 }\r
 \r
 \r
@@ -163,8 +163,8 @@ void PsndRerate(int preserve_state)
 PICO_INTERNAL void Psnd_timers_and_dac(int raster)\r
 {\r
   int pos, len;\r
-  int do_dac = PsndOut && (PicoOpt&1) && *ym2612_dacen;\r
-//  int do_pcm = PsndOut && (PicoMCD&1) && (PicoOpt&0x400);\r
+  int do_dac = PsndOut && (PicoOpt&POPT_EN_FM) && *ym2612_dacen;\r
+//  int do_pcm = PsndOut && (PicoAHW&1) && (PicoOpt&0x400);\r
 \r
   // Our raster lasts 63.61323/64.102564 microseconds (NTSC/PAL)\r
   YM2612PicoTick(1);\r
@@ -176,10 +176,11 @@ PICO_INTERNAL void Psnd_timers_and_dac(int raster)
 \r
   pos>>=4;\r
 \r
-  if (do_dac) {\r
+  if (do_dac)\r
+  {\r
     short *d = PsndOut + pos*2;\r
     int dout = *ym2612_dacout;\r
-    if(PicoOpt&8) {\r
+    if(PicoOpt&POPT_EN_STEREO) {\r
       // some manual loop unrolling here :)\r
       d[0] = dout;\r
       if (len > 1) {\r
@@ -212,7 +213,7 @@ PICO_INTERNAL void PsndClear(void)
 {\r
   int len = PsndLen;\r
   if (PsndLen_exc_add) len++;\r
-  if (PicoOpt & 8)\r
+  if (PicoOpt & POPT_EN_STEREO)\r
     memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned\r
   else {\r
     short *out = PsndOut;\r
@@ -229,7 +230,8 @@ PICO_INTERNAL int PsndRender(int offset, int length)
   int *buf32 = PsndBuffer+offset;\r
   int stereo = (PicoOpt & 8) >> 3;\r
   // emulating CD && PCM option enabled && PCM chip on && have enabled channels\r
-  int do_pcm = (PicoMCD&1) && (PicoOpt&0x400) && (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;\r
+  int do_pcm = (PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_PCM) &&\r
+               (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;\r
   offset <<= stereo;\r
 \r
 #if !SIMPLE_WRITE_SOUND\r
@@ -244,11 +246,11 @@ PICO_INTERNAL int PsndRender(int offset, int length)
 #endif\r
 \r
   // PSG\r
-  if (PicoOpt & 2)\r
+  if (PicoOpt & POPT_EN_PSG)\r
     SN76496Update(PsndOut+offset, length, stereo);\r
 \r
   // Add in the stereo FM buffer\r
-  if (PicoOpt & 1) {\r
+  if (PicoOpt & POPT_EN_FM) {\r
     buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);\r
   } else\r
     memset32(buf32, 0, length<<stereo);\r
@@ -263,7 +265,8 @@ PICO_INTERNAL int PsndRender(int offset, int length)
 \r
   // CD: CDDA audio\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
+  if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_CDDA) &&\r
+               !(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