spu: rework irq handling and loop reloading

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

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index d7e45b1..ec097c5 100644 (file)
--- 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));\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
- d->bIgnoreLoop = 0;\r
+ // this one is nasty but safe, save compat is important\r
+ d->bIgnoreLoop = (s->prevflags ^ 2) << 1;\r
  d->iRightVolume = s->iRightVolume;\r
  d->iRawPitch = s->iRawPitch;\r
  d->s_1 = s->SB[27]; // yes it's reversed\r
@@ -179,7 +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->prevflags = (s->bIgnoreLoop >> 1) ^ 2;\r
  d->ADSRX.State = s->ADSRX.State;\r
  d->ADSRX.AttackModeExp = s->ADSRX.AttackModeExp;\r
  d->ADSRX.AttackRate = s->ADSRX.AttackRate;\r
@@ -232,11 +232,11 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
    pFO->spuAddr=spuAddr;\r
    if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;\r
 \r
-   dwChannelOn&=~dwPendingChanOff;\r
-   dwPendingChanOff=0;\r
-\r
    for(i=0;i<MAXCHAN;i++)\r
     {\r
+     if(!(s_chan[i].prevflags&2))\r
+      dwChannelOn&=~(1<<i);\r
+\r
      save_channel(&pFO->s_chan[i],&s_chan[i],i);\r
      if(pFO->s_chan[i].pCurr)\r
       pFO->s_chan[i].pCurr-=(unsigned long)spuMemC;\r
@@ -257,7 +257,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
   SPUplayADPCMchannel(&pF->xaS);\r
 \r
  xapGlobal=0;\r
- dwPendingChanOff=0;\r
 \r
  if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)\r
    LoadStateV5(pF);\r