X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fdfsound%2Ffreeze.c;h=d7e45b11d7d9f5df8ae3a77ef13fb3261cd44d6f;hb=fb552464f06137102fd9ca69a05492265bbdcea7;hp=6caa6bf8db86ba899bbb31bfa32084e8e5c1b156;hpb=7e44d49d2a65d6e45d6f99f72a8cccdb02654aae;p=pcsx_rearmed.git

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 6caa6bf8..d7e45b11 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -134,6 +134,7 @@ 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;
@@ -178,6 +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->ADSRX.State = s->ADSRX.State;
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;
@@ -212,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);
 
@@ -244,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);
 
@@ -284,7 +280,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;
 }