diff options
| author | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-02-04 23:42:39 +0000 |
|---|---|---|
| committer | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-02-04 23:42:39 +0000 |
| commit | dda4b7bc4e1e5d0d39e7a4d4fac805303254427f (patch) | |
| tree | b186b03a1226a626d45102810b4b7a2acec1e9ea | |
| parent | 2d34422469ec621c6c74dd349356a96236f3eee1 (diff) | |
| download | pcsxr-dda4b7bc4e1e5d0d39e7a4d4fac805303254427f.tar.gz | |
dfsound
-adsr.c - fix decay,sustain math
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@62928 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | plugins/dfsound/adsr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c index 8d353287..a70639ec 100644 --- a/plugins/dfsound/adsr.c +++ b/plugins/dfsound/adsr.c @@ -228,9 +228,9 @@ INLINE int MixADSR(int ch) // MIX ADSR //--------------------------------------------------//
if(s_chan[ch].ADSRX.State==1) // -> decay
{
- EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.ReleaseRate * 4 ] * EnvelopeVol ) >> 15;
+ EnvelopeVol += ( RateTableSub[ s_chan[ch].ADSRX.DecayRate * 4 ] * EnvelopeVol ) >> 15;
- EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.ReleaseRate * 4 ];
+ EnvelopeVol_f += RateTableSub_f[ s_chan[ch].ADSRX.DecayRate * 4 ];
if( EnvelopeVol_f < 0 ) {
EnvelopeVol_f += RateTable_denom;
EnvelopeVol--;
@@ -268,7 +268,7 @@ INLINE int MixADSR(int ch) // MIX ADSR else
EnvelopeVol+=RateTableAdd[s_chan[ch].ADSRX.SustainRate + 0];
- EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate ];
+ EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate ];
if( EnvelopeVol_f >= RateTable_denom ) {
EnvelopeVol_f -= RateTable_denom;
EnvelopeVol++;
|