X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=a400cf7cb3723a47fcb18c29ed7cf4d57e43473b;hb=3113a160828f9353715e4b8cc1041d9c86162df2;hp=43e6535ce36ee25fab5dc04a6baa4a85b3c1e209;hpb=0c1151feca09186ec61485436912a3e563c40b54;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 43e6535c..a400cf7c 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -119,6 +119,7 @@ typedef struct
 typedef struct
 {
  unsigned short  spuIrq;
+ unsigned short  decode_pos;
  uint32_t   pSpuIrq;
  uint32_t   spuAddr;
  uint32_t   dummy1;
@@ -144,10 +145,10 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->spos = s->spos;
  d->sinc = s->sinc;
  memcpy(d->SB, spu.SB + ch * SB_SIZE, sizeof(d->SB[0]) * SB_SIZE);
- d->iStart = (regAreaGet(ch,6)&~1)<<3;
+ d->iStart = (regAreaGetCh(ch, 6) & ~1) << 3;
  d->iCurr = 0; // set by the caller
  d->iLoop = 0; // set by the caller
- d->bOn = !!(spu.dwChannelOn & (1<<ch));
+ d->bOn = !!(spu.dwChannelsAudible & (1<<ch));
  d->bStop = s->ADSRX.State == ADSR_RELEASE;
  d->bReverb = s->bReverb;
  d->iActFreq = 1;
@@ -208,7 +209,7 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;
  d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;
  d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;
- if (s->bOn) spu.dwChannelOn |= 1<<ch;
+ if (s->bOn) spu.dwChannelsAudible |= 1<<ch;
  else d->ADSRX.EnvelopeVol = 0;
 }
 
@@ -261,6 +262,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
 
    pFO->spuAddr=spu.spuAddr;
    if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
+   pFO->decode_pos = spu.decode_pos;
 
    for(i=0;i<MAXCHAN;i++)
     {
@@ -282,7 +284,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
  spu.bMemDirty = 1;
 
  if(pF->xaS.nsamples<=4032)                            // start xa again
-  SPUplayADPCMchannel(&pF->xaS);
+  SPUplayADPCMchannel(&pF->xaS, spu.cycles_played, 0);
 
  spu.xapGlobal=0;
 
@@ -329,9 +331,10 @@ void LoadStateV5(SPUFreeze_t * pF)
    if (pFO->spuAddr == 0xbaadf00d) spu.spuAddr = 0;
    else spu.spuAddr = pFO->spuAddr & 0x7fffe;
   }
+ spu.decode_pos = pFO->decode_pos & 0x1ff;
 
  spu.dwNewChannel=0;
- spu.dwChannelOn=0;
+ spu.dwChannelsAudible=0;
  spu.dwChannelDead=0;
  for(i=0;i<MAXCHAN;i++)
   {
@@ -354,7 +357,7 @@ void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)
   }
 
  spu.dwNewChannel=0;
- spu.dwChannelOn=0;
+ spu.dwChannelsAudible=0;
  spu.dwChannelDead=0;
  spu.pSpuIrq=spu.spuMemC;