X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fsound%2Fsound.c;h=f3cd2217b51b1dd866f9be3ed62dd8f72ea89483;hb=2446536be520914616403876d7e49621ac6f4b95;hp=5a9b8b3399557e76f2bfa651987ae673a5defd00;hpb=98da48e4181441545c6a66e622f845ab33b34e5b;p=picodrive.git

diff --git a/pico/sound/sound.c b/pico/sound/sound.c
index 5a9b8b3..f3cd221 100644
--- a/pico/sound/sound.c
+++ b/pico/sound/sound.c
@@ -1,11 +1,11 @@
-// This is part of Pico Library
-
-// (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006,2007 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
-
+/*
+ * PicoDrive
+ * (c) Copyright Dave, 2004
+ * (C) notaz, 2006-2009
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include <string.h>
 #include "ym2612.h"
@@ -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
@@ -335,6 +337,7 @@ static int PsndRender(int offset, int length)
     memset32(buf32, 0, length<<stereo);
 
 //printf("active_chs: %02x\n", buf32_updated);
+  (void)buf32_updated;
 
   // CD: PCM sound
   if (do_pcm) {
@@ -362,6 +365,8 @@ static int PsndRender(int offset, int length)
   // convert + limit to normal 16bit output
   PsndMix_32_to_16l(PsndOut+offset, buf32, length);
 
+  pprof_end(sound);
+
   return length;
 }
 
@@ -371,7 +376,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;
@@ -381,8 +387,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();
   }
@@ -420,7 +429,7 @@ PICO_INTERNAL void PsndGetSamplesMS(void)
   }
 
   if (PicoWriteSound != NULL)
-    PicoWriteSound(length);
+    PicoWriteSound(length * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));
   PsndClear();
 }