spu: fix saving bug

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

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 58a8347..0601bf5 100644 (file)
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -27,6 +27,24 @@
 // freeze structs\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
+typedef struct\r
+{\r
+ int            AttackModeExp;\r
+ int            AttackTime;\r
+ int            DecayTime;\r
+ int            SustainLevel;\r
+ int            SustainModeExp;\r
+ int            SustainModeDec;\r
+ int            SustainTime;\r
+ int            ReleaseModeExp;\r
+ unsigned int   ReleaseVal;\r
+ int            ReleaseTime;\r
+ int            ReleaseStartTime; \r
+ int            ReleaseVol; \r
+ int            lTime;\r
+ int            lVolume;\r
+} ADSRInfo;\r
+\r
 typedef struct\r
 {\r
  int            State;\r
@@ -40,9 +58,9 @@ typedef struct
  int            ReleaseModeExp;\r
  int            ReleaseRate;\r
  int            EnvelopeVol;\r
- long           lVolume;\r
- long           lDummy1;\r
- long           lDummy2;\r
+ int            lVolume;\r
+ int            lDummy1;\r
+ int            lDummy2;\r
 } ADSRInfoEx_orig;\r
 \r
 typedef struct\r
@@ -170,7 +188,6 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  memcpy(d->SB, s->SB, sizeof(d->SB));\r
  d->pCurr = (void *)((long)s->iCurr & 0x7fff0);\r
  d->pLoop = (void *)((long)s->iLoop & 0x7fff0);\r
- if (s->bOn) dwChannelOn |= 1<<ch;\r
  d->bStop = s->bStop;\r
  d->bReverb = s->bReverb;\r
  d->iLeftVolume = s->iLeftVolume;\r
@@ -191,6 +208,8 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;\r
  d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;\r
  d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;\r
+ if (s->bOn) dwChannelOn |= 1<<ch;\r
+ else d->ADSRX.EnvelopeVol = 0;\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
@@ -234,9 +253,6 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode,SPUFreeze_t * pF)
 \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(s_chan[i].pCurr)\r
       pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC;\r