X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=ec097c5be8139ed60fbdcbbba9dc6fe66777e425;hp=1c037fe188b4c78aef1e1bc5f68fbe65a1433fbf;hb=3b3dee71d84bbbb376548d794b7a11cd38833cf0;hpb=be1cb678c445cb8d9a4d707c698f0dc600a490ea

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 1c037fe1..ec097c5b 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -134,11 +134,11 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->bOn = !!(dwChannelOn & (1<<ch));
  d->bStop = s->bStop;
  d->bReverb = s->bReverb;
- d->bIgnoreLoop = s->bJump;
  d->iActFreq = 1;
  d->iUsedFreq = 2;
  d->iLeftVolume = s->iLeftVolume;
- d->bIgnoreLoop = 0;
+ // this one is nasty but safe, save compat is important
+ d->bIgnoreLoop = (s->prevflags ^ 2) << 1;
  d->iRightVolume = s->iRightVolume;
  d->iRawPitch = s->iRawPitch;
  d->s_1 = s->SB[27]; // yes it's reversed
@@ -179,7 +179,7 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->bRVBActive = s->bRVBActive;
  d->bNoise = s->bNoise;
  d->bFMod = s->bFMod;
- d->bJump = s->bIgnoreLoop;
+ d->prevflags = (s->bIgnoreLoop >> 1) ^ 2;
  d->ADSRX.State = s->ADSRX.State;
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;
@@ -214,8 +214,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
 
    if(ulFreezeMode==2) return 1;                       // info mode? ok, bye
                                                        // save mode:
-   RemoveTimer();                                      // stop timer
-
    memcpy(pF->cSPURam,spuMem,0x80000);                 // copy common infos
    memcpy(pF->cSPUPort,regArea,0x200);
 
@@ -234,11 +232,11 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
    pFO->spuAddr=spuAddr;
    if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
 
-   dwChannelOn&=~dwPendingChanOff;
-   dwPendingChanOff=0;
-
    for(i=0;i<MAXCHAN;i++)
     {
+     if(!(s_chan[i].prevflags&2))
+      dwChannelOn&=~(1<<i);
+
      save_channel(&pFO->s_chan[i],&s_chan[i],i);
      if(pFO->s_chan[i].pCurr)
       pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;
@@ -246,16 +244,12 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
       pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;
     }
 
-   SetupTimer();                                       // sound processing on again
-
    return 1;
    //--------------------------------------------------//
   }
                                                        
  if(ulFreezeMode!=0) return 0;                         // bad mode? bye
 
- RemoveTimer();                                        // we stop processing while doing the save!
-
  memcpy(spuMem,pF->cSPURam,0x80000);                   // get ram
  memcpy(regArea,pF->cSPUPort,0x200);
 
@@ -263,7 +257,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
   SPUplayADPCMchannel(&pF->xaS);
 
  xapGlobal=0;
- dwPendingChanOff=0;
 
  if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
    LoadStateV5(pF);
@@ -286,7 +279,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
  // fix to prevent new interpolations from crashing
  for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;
 
- SetupTimer();                                         // start sound processing again
+ ClearWorkingState();
 
  return 1;
 }