X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Fadsr.c;h=1e397af7851efe4feb2e6ed11ef71b37e5a2090e;hp=387a83b24ad08125d955abb00a953b241c1ed4f1;hb=6d866bb7894b252fc430a24a97769511d5ead1ca;hpb=009faf24e665b66283558234920faab03b781d6c

diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c
index 387a83b2..1e397af7 100644
--- a/plugins/dfsound/adsr.c
+++ b/plugins/dfsound/adsr.c
@@ -53,8 +53,7 @@ void InitADSR(void)                                    // INIT ADSR
 
 INLINE void StartADSR(int ch)                          // MIX ADSR
 {
- s_chan[ch].ADSRX.lVolume=1;                           // and init some adsr vars
- s_chan[ch].ADSRX.State=0;
+ s_chan[ch].ADSRX.State=0;                             // and init some adsr vars
  s_chan[ch].ADSRX.EnvelopeVol=0;
 }
 
@@ -94,8 +93,7 @@ INLINE int MixADSR(int ch)                             // MIX ADSR
      //s_chan[ch].bNoise=0;
     }
 
-   s_chan[ch].ADSRX.lVolume=s_chan[ch].ADSRX.EnvelopeVol>>21;
-   return s_chan[ch].ADSRX.lVolume;
+   return s_chan[ch].ADSRX.EnvelopeVol>>21;
   }
  else                                                  // not stopped yet?
   {
@@ -119,8 +117,7 @@ INLINE int MixADSR(int ch)                             // MIX ADSR
        s_chan[ch].ADSRX.State=1;
       }
 
-     s_chan[ch].ADSRX.lVolume=s_chan[ch].ADSRX.EnvelopeVol>>21;
-     return s_chan[ch].ADSRX.lVolume;
+     return s_chan[ch].ADSRX.EnvelopeVol>>21;
     }
    //--------------------------------------------------//
    if(s_chan[ch].ADSRX.State==1)                       // -> decay
@@ -143,8 +140,7 @@ INLINE int MixADSR(int ch)                             // MIX ADSR
        s_chan[ch].ADSRX.State=2;
       }
 
-     s_chan[ch].ADSRX.lVolume=s_chan[ch].ADSRX.EnvelopeVol>>21;
-     return s_chan[ch].ADSRX.lVolume;
+     return s_chan[ch].ADSRX.EnvelopeVol>>21;
     }
    //--------------------------------------------------//
    if(s_chan[ch].ADSRX.State==2)                       // -> sustain
@@ -194,8 +190,7 @@ INLINE int MixADSR(int ch)                             // MIX ADSR
          s_chan[ch].ADSRX.EnvelopeVol=0;
         }
       }
-     s_chan[ch].ADSRX.lVolume=s_chan[ch].ADSRX.EnvelopeVol>>21;
-     return s_chan[ch].ADSRX.lVolume;
+     return s_chan[ch].ADSRX.EnvelopeVol>>21;
     }
   }
  return 0;