X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=51e9fd77582436cf78c92db10aecc3d853f41160;hb=7a8d521fba9c86ae7b51369ce061bf63112b745f;hp=0b11c1085195aad35b69cd9b17de608419d50334;hpb=63a4f6b6a3b0315590cd3009df2c92480ed2d98b;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 0b11c108..51e9fd77 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;
@@ -143,11 +144,11 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->iSBPos = s->iSBPos;
  d->spos = s->spos;
  d->sinc = s->sinc;
- memcpy(d->SB, s->SB, sizeof(d->SB));
- d->iStart = (regAreaGet(ch,6)&~1)<<3;
+ memcpy(d->SB, spu.SB + ch * SB_SIZE, sizeof(d->SB[0]) * SB_SIZE);
+ 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;
@@ -157,8 +158,8 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->bIgnoreLoop = (s->prevflags ^ 2) << 1;
  d->iRightVolume = s->iRightVolume;
  d->iRawPitch = s->iRawPitch;
- d->s_1 = s->SB[27]; // yes it's reversed
- d->s_2 = s->SB[26];
+ d->s_1 = spu.SB[ch * SB_SIZE + 27]; // yes it's reversed
+ d->s_2 = spu.SB[ch * SB_SIZE + 26];
  d->bRVBActive = s->bRVBActive;
  d->bNoise = s->bNoise;
  d->bFMod = s->bFMod;
@@ -185,9 +186,9 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->spos = s->spos;
  d->sinc = s->sinc;
  d->sinc_inv = 0;
- memcpy(d->SB, s->SB, sizeof(d->SB));
- d->pCurr = (void *)((long)s->iCurr & 0x7fff0);
- d->pLoop = (void *)((long)s->iLoop & 0x7fff0);
+ memcpy(spu.SB + ch * SB_SIZE, s->SB, sizeof(spu.SB[0]) * SB_SIZE);
+ d->pCurr = (void *)((uintptr_t)s->iCurr & 0x7fff0);
+ d->pLoop = (void *)((uintptr_t)s->iLoop & 0x7fff0);
  d->bReverb = s->bReverb;
  d->iLeftVolume = s->iLeftVolume;
  d->iRightVolume = s->iRightVolume;
@@ -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;
 }
 
@@ -231,6 +232,8 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
 
  if(!pF) return 0;                                     // first check
 
+ do_samples(cycles, 1);
+
  if(ulFreezeMode)                                      // info or save?
   {//--------------------------------------------------//
    if(ulFreezeMode==1)                                 
@@ -242,8 +245,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
 
    if(ulFreezeMode==2) return 1;                       // info mode? ok, bye
                                                        // save mode:
-   do_samples(cycles, 1);
-
    memcpy(pF->cSPURam,spu.spuMem,0x80000);             // copy common infos
    memcpy(pF->cSPUPort,spu.regArea,0x200);
 
@@ -257,18 +258,19 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
    pFO=(SPUOSSFreeze_t *)(pF+1);                       // store special stuff
 
    pFO->spuIrq = spu.regArea[(H_SPUirqAddr - 0x0c00) / 2];
-   if(spu.pSpuIrq) pFO->pSpuIrq  = (unsigned long)spu.pSpuIrq-(unsigned long)spu.spuMemC;
+   if(spu.pSpuIrq) pFO->pSpuIrq = spu.pSpuIrq - spu.spuMemC;
 
    pFO->spuAddr=spu.spuAddr;
    if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
+   pFO->decode_pos = spu.decode_pos;
 
    for(i=0;i<MAXCHAN;i++)
     {
-     save_channel(&pFO->s_chan[i],&s_chan[i],i);
-     if(s_chan[i].pCurr)
-      pFO->s_chan[i].iCurr=s_chan[i].pCurr-spu.spuMemC;
-     if(s_chan[i].pLoop)
-      pFO->s_chan[i].iLoop=s_chan[i].pLoop-spu.spuMemC;
+     save_channel(&pFO->s_chan[i],&spu.s_chan[i],i);
+     if(spu.s_chan[i].pCurr)
+      pFO->s_chan[i].iCurr=spu.s_chan[i].pCurr-spu.spuMemC;
+     if(spu.s_chan[i].pLoop)
+      pFO->s_chan[i].iLoop=spu.s_chan[i].pLoop-spu.spuMemC;
     }
 
    return 1;
@@ -279,9 +281,10 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
 
  memcpy(spu.spuMem,pF->cSPURam,0x80000);               // get ram
  memcpy(spu.regArea,pF->cSPUPort,0x200);
+ spu.bMemDirty = 1;
 
  if(pF->xaS.nsamples<=4032)                            // start xa again
-  SPUplayADPCMchannel(&pF->xaS);
+  SPUplayADPCMchannel(&pF->xaS, spu.cycles_played, 0);
 
  spu.xapGlobal=0;
 
@@ -302,7 +305,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
  load_register(H_CDRight, cycles);
 
  // fix to prevent new interpolations from crashing
- for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;
+ for(i=0;i<MAXCHAN;i++) spu.SB[i * SB_SIZE + 28]=0;
 
  ClearWorkingState();
  spu.cycles_played = cycles;
@@ -325,19 +328,20 @@ void LoadStateV5(SPUFreeze_t * pF)
 
  if(pFO->spuAddr)
   {
-   spu.spuAddr = pFO->spuAddr;
-   if (spu.spuAddr == 0xbaadf00d) spu.spuAddr = 0;
+   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++)
   {
-   load_channel(&s_chan[i],&pFO->s_chan[i],i);
+   load_channel(&spu.s_chan[i],&pFO->s_chan[i],i);
 
-   s_chan[i].pCurr+=(unsigned long)spu.spuMemC;
-   s_chan[i].pLoop+=(unsigned long)spu.spuMemC;
+   spu.s_chan[i].pCurr+=(uintptr_t)spu.spuMemC;
+   spu.s_chan[i].pLoop+=(uintptr_t)spu.spuMemC;
   }
 }
 
@@ -349,11 +353,11 @@ void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)
 
  for(i=0;i<MAXCHAN;i++)
   {
-   s_chan[i].pLoop=spu.spuMemC;
+   spu.s_chan[i].pLoop=spu.spuMemC;
   }
 
  spu.dwNewChannel=0;
- spu.dwChannelOn=0;
+ spu.dwChannelsAudible=0;
  spu.dwChannelDead=0;
  spu.pSpuIrq=spu.spuMemC;