X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fsound%2Fsound.c;h=615e324dc9dc92c1199111774db002e6e19c6980;hb=72de54727a87873e8ae30a1ddebe3d0342de7b10;hp=6e0db26ca7ccd700a11ebc0c9e4ca3953bd7b37d;hpb=af37bca858874b5cbd5ab126eaba1fad6ff7ab72;p=picodrive.git

diff --git a/pico/sound/sound.c b/pico/sound/sound.c
index 6e0db26..615e324 100644
--- a/pico/sound/sound.c
+++ b/pico/sound/sound.c
@@ -247,7 +247,7 @@ PICO_INTERNAL void cdda_start_play(void)
   lba_offset += Pico_mcd->TOC.Tracks[index].Offset;
 
   // find the actual file for this track
-  for (i = index; i >= 0; i--)
+  for (i = index; i > 0; i--)
     if (Pico_mcd->TOC.Tracks[i].F != NULL) break;
 
   if (Pico_mcd->TOC.Tracks[i].F == NULL) {
@@ -291,7 +291,7 @@ PICO_INTERNAL void PsndClear(void)
     memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned
   else {
     short *out = PsndOut;
-    if ((int)out & 2) { *out++ = 0; len--; }
+    if ((long)out & 2) { *out++ = 0; len--; }
     memset32((int *) out, 0, len/2);
     if (len & 1) out[len-1] = 0;
   }
@@ -308,6 +308,8 @@ static int PsndRender(int offset, int length)
 		(Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;
   offset <<= stereo;
 
+  pprof_start(sound);
+
 #if !SIMPLE_WRITE_SOUND
   if (offset == 0) { // should happen once per frame
     // compensate for float part of PsndLen
@@ -356,9 +358,14 @@ static int PsndRender(int offset, int length)
       cdda_raw_update(buf32, length);
   }
 
+  if ((PicoAHW & PAHW_32X) && (PicoOpt & POPT_EN_PWM))
+    p32x_pwm_update(buf32, length, stereo);
+
   // convert + limit to normal 16bit output
   PsndMix_32_to_16l(PsndOut+offset, buf32, length);
 
+  pprof_end(sound);
+
   return length;
 }
 
@@ -368,7 +375,8 @@ PICO_INTERNAL void PsndGetSamples(int y)
 #if SIMPLE_WRITE_SOUND
   if (y != 224) return;
   PsndRender(0, PsndLen);
-  if (PicoWriteSound) PicoWriteSound(PsndLen);
+  if (PicoWriteSound)
+    PicoWriteSound(PsndLen * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));
   PsndClear();
 #else
   static int curr_pos = 0;
@@ -378,8 +386,11 @@ PICO_INTERNAL void PsndGetSamples(int y)
     if (emustatus & 2)
          curr_pos += PsndRender(curr_pos, PsndLen-PsndLen/2);
     else curr_pos  = PsndRender(0, PsndLen);
-    if (emustatus&1) emustatus|=2; else emustatus&=~2;
-    if (PicoWriteSound) PicoWriteSound(curr_pos);
+    if (emustatus & 1)
+         emustatus |=  2;
+    else emustatus &= ~2;
+    if (PicoWriteSound)
+      PicoWriteSound(curr_pos * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));
     // clear sound buffer
     PsndClear();
   }
@@ -417,7 +428,7 @@ PICO_INTERNAL void PsndGetSamplesMS(void)
   }
 
   if (PicoWriteSound != NULL)
-    PicoWriteSound(length);
+    PicoWriteSound(length * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));
   PsndClear();
 }