X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Ffreeze.c;h=0601bf5c0c0353c491b83e5d6b91948512603f77;hp=58a8347674c059921f86e5f9fedcb82ab6f843ea;hb=6f6fe96900374d8744473ce240279e66d1260191;hpb=8e1040b6a82ee1802fda83d4de84290a02656cc0;ds=sidebyside

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