X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fsound%2Fsound.c;h=ab6b7e1c38ae08c3242ad952feb9afa1c5de356b;hb=453d2a6edadbd6a0977b76eba14961006c907f01;hp=6c7c6d8757c1a070f1af4bc3cc65b7b4c449e0ed;hpb=4b9c58882616c5205a5ad5c9350f20a3d22bd7e1;p=picodrive.git

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index 6c7c6d8..ab6b7e1 100644
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -35,8 +35,8 @@ int PsndDacLine=0;
 short *PsndOut=NULL; // PCM data buffer
 
 // timers
-int timer_a_next_oflow, timer_a_step; // in z80 cycles
-//int
+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;
@@ -46,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) {
@@ -63,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) {
@@ -88,8 +93,9 @@ static void dac_recalculate(void)
     if (PsndLen_exc_add) len++;
     dac_info[224] = (pos<<4)|len;
   }
+  mid = (dac_info[lines-1] & 0xfff0) + ((dac_info[lines-1] & 0xf) << 4);
   for (i = lines; i < sizeof(dac_info) / sizeof(dac_info[0]); i++)
-    dac_info[i] = 0;
+    dac_info[i] = mid;
   //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;
@@ -134,7 +140,7 @@ void PsndRerate(int preserve_state)
   if (preserve_state) {
     // feed it back it's own registers, just like after loading state
     memcpy(YM2612GetRegs(), state, 0x200);
-    YM2612PicoStateLoad();
+    ym2612_unpack_state();
     if ((PicoAHW & PAHW_MCD) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
       cdda_start_play();
   }