get rid of port_config.h

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

diff --git a/pico/sound/sound.c b/pico/sound/sound.c
index e1e0408..ede33f1 100644 (file)
--- a/pico/sound/sound.c
+++ b/pico/sound/sound.c
@@ -1,11 +1,11 @@
-// This is part of Pico Library\r
-\r
-// (c) Copyright 2004 Dave, All rights reserved.\r
-// (c) Copyright 2006,2007 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
-\r
+/*\r
+ * PicoDrive\r
+ * (c) Copyright Dave, 2004\r
+ * (C) notaz, 2006-2009\r
+ *\r
+ * This work is licensed under the terms of MAME license.\r
+ * See COPYING file in the top-level directory.\r
+ */\r
 \r
 #include <string.h>\r
 #include "ym2612.h"\r
@@ -14,6 +14,8 @@
 #include "../cd/pcm.h"\r
 #include "mix.h"\r
 \r
+#define SIMPLE_WRITE_SOUND 0\r
+\r
 void (*PsndMix_32_to_16l)(short *dest, int *src, int count) = mix_32_to_16l_stereo;\r
 \r
 // master int buffer to mix to\r
@@ -107,14 +109,9 @@ static void dac_recalculate(void)
 \r
 PICO_INTERNAL void PsndReset(void)\r
 {\r
-  void *ym2612_regs;\r
-\r
-  // also clear the internal registers+addr line\r
-  ym2612_regs = YM2612GetRegs();\r
-  memset(ym2612_regs, 0, 0x200+4);\r
-  timers_reset();\r
-\r
+  // PsndRerate calls YM2612Init, which also resets\r
   PsndRerate(0);\r
+  timers_reset();\r
 }\r
 \r
 \r
@@ -186,6 +183,9 @@ PICO_INTERNAL void PsndDoDAC(int line_to)
   int dout = ym2612.dacout;\r
   int line_from = PsndDacLine;\r
 \r
+  if (line_to >= 312)\r
+    line_to = 311;\r
+\r
   PsndDacLine = line_to + 1;\r
 \r
   pos =dac_info[line_from]>>4;\r
@@ -252,7 +252,7 @@ PICO_INTERNAL void cdda_start_play(void)
   lba_offset += Pico_mcd->TOC.Tracks[index].Offset;\r
 \r
   // find the actual file for this track\r
-  for (i = index; i >= 0; i--)\r
+  for (i = index; i > 0; i--)\r
     if (Pico_mcd->TOC.Tracks[i].F != NULL) break;\r
 \r
   if (Pico_mcd->TOC.Tracks[i].F == NULL) {\r
@@ -296,7 +296,7 @@ PICO_INTERNAL void PsndClear(void)
     memset32((int *) PsndOut, 0, len); // assume PsndOut to be aligned\r
   else {\r
     short *out = PsndOut;\r
-    if ((int)out & 2) { *out++ = 0; len--; }\r
+    if ((long)out & 2) { *out++ = 0; len--; }\r
     memset32((int *) out, 0, len/2);\r
     if (len & 1) out[len-1] = 0;\r
   }\r
@@ -313,6 +313,8 @@ static int PsndRender(int offset, int length)
                (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;\r
   offset <<= stereo;\r
 \r
+  pprof_start(sound);\r
+\r
 #if !SIMPLE_WRITE_SOUND\r
   if (offset == 0) { // should happen once per frame\r
     // compensate for float part of PsndLen\r
@@ -340,6 +342,7 @@ static int PsndRender(int offset, int length)
     memset32(buf32, 0, length<<stereo);\r
 \r
 //printf("active_chs: %02x\n", buf32_updated);\r
+  (void)buf32_updated;\r
 \r
   // CD: PCM sound\r
   if (do_pcm) {\r
@@ -361,9 +364,14 @@ static int PsndRender(int offset, int length)
       cdda_raw_update(buf32, length);\r
   }\r
 \r
+  if ((PicoAHW & PAHW_32X) && (PicoOpt & POPT_EN_PWM))\r
+    p32x_pwm_update(buf32, length, stereo);\r
+\r
   // convert + limit to normal 16bit output\r
   PsndMix_32_to_16l(PsndOut+offset, buf32, length);\r
 \r
+  pprof_end(sound);\r
+\r
   return length;\r
 }\r
 \r
@@ -373,7 +381,8 @@ PICO_INTERNAL void PsndGetSamples(int y)
 #if SIMPLE_WRITE_SOUND\r
   if (y != 224) return;\r
   PsndRender(0, PsndLen);\r
-  if (PicoWriteSound) PicoWriteSound(PsndLen);\r
+  if (PicoWriteSound)\r
+    PicoWriteSound(PsndLen * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
   PsndClear();\r
 #else\r
   static int curr_pos = 0;\r
@@ -383,8 +392,11 @@ PICO_INTERNAL void PsndGetSamples(int y)
     if (emustatus & 2)\r
          curr_pos += PsndRender(curr_pos, PsndLen-PsndLen/2);\r
     else curr_pos  = PsndRender(0, PsndLen);\r
-    if (emustatus&1) emustatus|=2; else emustatus&=~2;\r
-    if (PicoWriteSound) PicoWriteSound(curr_pos);\r
+    if (emustatus & 1)\r
+         emustatus |=  2;\r
+    else emustatus &= ~2;\r
+    if (PicoWriteSound)\r
+      PicoWriteSound(curr_pos * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
     // clear sound buffer\r
     PsndClear();\r
   }\r
@@ -396,3 +408,33 @@ PICO_INTERNAL void PsndGetSamples(int y)
 #endif\r
 }\r
 \r
+PICO_INTERNAL void PsndGetSamplesMS(void)\r
+{\r
+  int stereo = (PicoOpt & 8) >> 3;\r
+  int length = PsndLen;\r
+\r
+#if !SIMPLE_WRITE_SOUND\r
+  // compensate for float part of PsndLen\r
+  PsndLen_exc_cnt += PsndLen_exc_add;\r
+  if (PsndLen_exc_cnt >= 0x10000) {\r
+    PsndLen_exc_cnt -= 0x10000;\r
+    length++;\r
+  }\r
+#endif\r
+\r
+  // PSG\r
+  if (PicoOpt & POPT_EN_PSG)\r
+    SN76496Update(PsndOut, length, stereo);\r
+\r
+  // upmix to "stereo" if needed\r
+  if (stereo) {\r
+    int i, *p;\r
+    for (i = length, p = (void *)PsndOut; i > 0; i--, p++)\r
+      *p |= *p << 16;\r
+  }\r
+\r
+  if (PicoWriteSound != NULL)\r
+    PicoWriteSound(length * ((PicoOpt & POPT_EN_STEREO) ? 4 : 2));\r
+  PsndClear();\r
+}\r
+\r