X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=4bc92922a955837c1e5ea5072fdafe74288eaa36;hb=43e6eaad0b73b37907be3342e0fd4cf65919e9f6;hp=c39d0c194437a0f673dda9060ed8ab83a04d28e2;hpb=c9e1affca5438353fdb156fb07a747af83251e14;p=picodrive.git

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index c39d0c1..4bc9292 100644
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -21,7 +21,7 @@ void (*PsndMix_32_to_16l)(short *dest, int *src, int count) = mix_32_to_16l_ster
 static int PsndBuffer[2*44100/50];
 
 // dac
-static unsigned short dac_info[312]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample
+static unsigned short dac_info[312+4]; // pppppppp ppppllll, p - pos in buff, l - length to write for this sample
 
 // cdda output buffer
 short cdda_out_buffer[2*1152];
@@ -31,8 +31,13 @@ int PsndRate=0;
 int PsndLen=0; // number of mono samples, multiply by 2 for stereo
 int PsndLen_exc_add=0; // this is for non-integer sample counts per line, eg. 22050/60
 int PsndLen_exc_cnt=0;
+int PsndDacLine=0;
 short *PsndOut=NULL; // PCM data buffer
 
+// timers
+int timer_a_next_oflow, timer_a_step, timer_a_offset; // in z80 cycles
+int timer_b_next_oflow, timer_b_step, timer_b_offset;
+
 // sn76496
 extern int *sn76496_regs;
 
@@ -41,13 +46,15 @@ static void dac_recalculate(void)
 {
   int i, dac_cnt, pos, len, lines = Pico.m.pal ? 312 : 262, mid = Pico.m.pal ? 68 : 93;
 
-  if(PsndLen <= lines) {
+  if (PsndLen <= lines)
+  {
     // shrinking algo
     dac_cnt = -PsndLen;
     len=1; pos=0;
     dac_info[225] = 1;
 
-    for(i=226; i != 225; i++) {
+    for(i=226; i != 225; i++)
+    {
       if (i >= lines) i = 0;
       len = 0;
       if(dac_cnt < 0) {
@@ -58,11 +65,14 @@ static void dac_recalculate(void)
       dac_cnt -= PsndLen;
       dac_info[i] = (pos<<4)|len;
     }
-  } else {
+  }
+  else
+  {
     // stretching
     dac_cnt = PsndLen;
     pos=0;
-    for(i = 225; i != 224; i++) {
+    for(i = 225; i != 224; i++)
+    {
       if (i >= lines) i = 0;
       len=0;
       while(dac_cnt >= 0) {
@@ -83,6 +93,8 @@ static void dac_recalculate(void)
     if (PsndLen_exc_add) len++;
     dac_info[224] = (pos<<4)|len;
   }
+  for (i = lines; i < sizeof(dac_info) / sizeof(dac_info[0]); i++)
+    dac_info[i] = 0;
   //for(i=len=0; i < lines; i++) {
   //  printf("%03i : %03i : %i\n", i, dac_info[i]>>4, dac_info[i]&0xf);
   //  len+=dac_info[i]&0xf;
@@ -100,7 +112,7 @@ PICO_INTERNAL void PsndReset(void)
   // also clear the internal registers+addr line
   ym2612_regs = YM2612GetRegs();
   memset(ym2612_regs, 0, 0x200+4);
-  z80startCycle = z80stopCycle = 0;
+  timers_reset();
 
   PsndRerate(0);
 }
@@ -158,47 +170,31 @@ void PsndRerate(int preserve_state)
 
   // set mixer
   PsndMix_32_to_16l = (PicoOpt & POPT_EN_STEREO) ? mix_32_to_16l_stereo : mix_32_to_16_mono;
+
+  if (PicoAHW & PAHW_PICO)
+    PicoReratePico();
 }
 
 
-// This is called once per raster (aka line), but not necessarily for every line
-PICO_INTERNAL void Psnd_timers_and_dac(int raster)
+PICO_INTERNAL void PsndDoDAC(int line_to)
 {
-  int pos, len;
-  int do_dac = PsndOut && (PicoOpt&POPT_EN_FM) && *ym2612_dacen;
-//  int do_pcm = PsndOut && (PicoAHW&1) && (PicoOpt&0x400);
-
-  // Our raster lasts 63.61323/64.102564 microseconds (NTSC/PAL)
-  YM2612PicoTick(1);
+  int pos, pos1, len;
+  int dout = ym2612.dacout;
+  int line_from = PsndDacLine;
 
-  if (!do_dac /*&& !do_pcm*/) return;
+  PsndDacLine = line_to + 1;
 
-  pos=dac_info[raster], len=pos&0xf;
+  pos =dac_info[line_from]>>4;
+  pos1=dac_info[line_to];
+  len = ((pos1>>4)-pos) + (pos1&0xf);
   if (!len) return;
 
-  pos>>=4;
-
-  if (do_dac)
-  {
+  if (PicoOpt & POPT_EN_STEREO) {
     short *d = PsndOut + pos*2;
-    int dout = *ym2612_dacout;
-    if(PicoOpt&POPT_EN_STEREO) {
-      // some manual loop unrolling here :)
-      d[0] = dout;
-      if (len > 1) {
-        d[2] = dout;
-        if (len > 2)
-          d[4] = dout;
-      }
-    } else {
-      short *d = PsndOut + pos;
-      d[0] = dout;
-      if (len > 1) {
-        d[1] = dout;
-        if (len > 2)
-          d[2] = dout;
-      }
-    }
+    for (; len > 0; len--, d+=2) *d = dout;
+  } else {
+    short *d = PsndOut + pos;
+    for (; len > 0; len--, d++)  *d = dout;
   }
 
 #if 0
@@ -278,6 +274,11 @@ PICO_INTERNAL void cdda_start_play(void)
   cdda_stream = Pico_mcd->TOC.Tracks[i].F;
   PicoCDBufferFlush(); // buffering relies on fp not being touched
   pm_seek(cdda_stream, lba_offset * 2352, SEEK_SET);
+  if (Pico_mcd->TOC.Tracks[i].ftype == TYPE_WAV)
+  {
+    // skip headers, assume it's 44kHz stereo uncompressed
+    pm_seek(cdda_stream, 44, SEEK_CUR);
+  }
 }
 
 
@@ -321,6 +322,11 @@ PICO_INTERNAL int PsndRender(int offset, int length)
   if (PicoOpt & POPT_EN_PSG)
     SN76496Update(PsndOut+offset, length, stereo);
 
+  if (PicoAHW & PAHW_PICO) {
+    PicoPicoPCMUpdate(PsndOut+offset, length, stereo);
+    return length;
+  }
+
   // Add in the stereo FM buffer
   if (PicoOpt & POPT_EN_FM) {
     buf32_updated = YM2612UpdateOne(buf32, length, stereo, 1);