spu: get rid of iSPUIRQWait

[pcsx_rearmed.git] / plugins / dfsound / freeze.c

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 6caa6bf..d7e45b1 100644 (file)
--- 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));\r
  d->bStop = s->bStop;\r
  d->bReverb = s->bReverb;\r
+ d->bIgnoreLoop = s->bJump;\r
  d->iActFreq = 1;\r
  d->iUsedFreq = 2;\r
  d->iLeftVolume = s->iLeftVolume;\r
@@ -178,6 +179,7 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->bRVBActive = s->bRVBActive;\r
  d->bNoise = s->bNoise;\r
  d->bFMod = s->bFMod;\r
+ d->bJump = s->bIgnoreLoop;\r
  d->ADSRX.State = s->ADSRX.State;\r
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;\r
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;\r
@@ -212,8 +214,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
 \r
    if(ulFreezeMode==2) return 1;                       // info mode? ok, bye\r
                                                        // save mode:\r
-   RemoveTimer();                                      // stop timer\r
-\r
    memcpy(pF->cSPURam,spuMem,0x80000);                 // copy common infos\r
    memcpy(pF->cSPUPort,regArea,0x200);\r
 \r
@@ -244,16 +244,12 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
       pFO->s_chan[i].pLoop-=(unsigned long)spuMemC;\r
     }\r
 \r
-   SetupTimer();                                       // sound processing on again\r
-\r
    return 1;\r
    //--------------------------------------------------//\r
   }\r
                                                        \r
  if(ulFreezeMode!=0) return 0;                         // bad mode? bye\r
 \r
- RemoveTimer();                                        // we stop processing while doing the save!\r
-\r
  memcpy(spuMem,pF->cSPURam,0x80000);                   // get ram\r
  memcpy(regArea,pF->cSPUPort,0x200);\r
 \r
@@ -284,7 +280,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
  // fix to prevent new interpolations from crashing\r
  for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;\r
 \r
- SetupTimer();                                         // start sound processing again\r
+ ClearWorkingState();\r
 \r
  return 1;\r
 }\r