From dda4b7bc4e1e5d0d39e7a4d4fac805303254427f Mon Sep 17 00:00:00 2001 From: "SND\\shalma_cp" Date: Fri, 4 Feb 2011 23:42:39 +0000 Subject: dfsound -adsr.c - fix decay,sustain math git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@62928 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfsound/adsr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins') 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++; -- cgit v1.2.3