From ae675e5a1276a5da35de6c2c9e8c302263c6922f Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Sat, 5 Feb 2011 11:28:24 +0000 Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@62943 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfsound/adsr.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'plugins') diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c index 44d084b1..f75a5127 100644 --- a/plugins/dfsound/adsr.c +++ b/plugins/dfsound/adsr.c @@ -200,17 +200,17 @@ INLINE int MixADSR(int ch) // MIX ADSR if(s_chan[ch].ADSRX.AttackModeExp) { if(EnvelopeVol>=0x6000) { - EnvelopeVol+=RateTableAdd[ch->ADSRX.AttackRate + 8]; - EnvelopeVol_f += RateTableAdd_f[ ch->ADSRX.AttackRate + 8]; + EnvelopeVol+=RateTableAdd[s_chan[ch].ADSRX.AttackRate + 8]; + EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 8]; } else { - EnvelopeVol+=RateTableAdd[ch->ADSRX.AttackRate + 0]; - EnvelopeVol_f += RateTableAdd_f[ ch->ADSRX.AttackRate + 0]; + EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.AttackRate + 0]; + EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 0]; } } else { - EnvelopeVol+=RateTableAdd[ch->ADSRX.AttackRate + 0]; - EnvelopeVol_f += RateTableAdd_f[ ch->ADSRX.AttackRate + 0]; + EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.AttackRate + 0]; + EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.AttackRate + 0]; } if( EnvelopeVol_f >= RateTable_denom ) { @@ -266,17 +266,17 @@ INLINE int MixADSR(int ch) // MIX ADSR if(s_chan[ch].ADSRX.SustainModeExp) { if(EnvelopeVol>=0x6000) { - EnvelopeVol+=RateTableAdd[ch->ADSRX.SustainRate + 8]; - EnvelopeVol_f += RateTableAdd_f[ ch->ADSRX.SustainRate + 8]; + EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 8]; + EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 8]; } else { - EnvelopeVol+=RateTableAdd[ch->ADSRX.SustainRate + 0]; - EnvelopeVol_f += RateTableAdd_f[ ch->ADSRX.SustainRate + 0]; + EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 0]; + EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 0]; } } else { - EnvelopeVol+=RateTableAdd[ch->ADSRX.SustainRate + 0]; - EnvelopeVol_f += RateTableAdd_f[ ch->ADSRX.SustainRate + 0]; + EnvelopeVol+=RateTableAdd[ s_chan[ch].ADSRX.SustainRate + 0]; + EnvelopeVol_f += RateTableAdd_f[ s_chan[ch].ADSRX.SustainRate + 0]; } if( EnvelopeVol_f >= RateTable_denom ) { -- cgit v1.2.3