diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfsound/adsr.c | 24 |
1 files changed, 12 insertions, 12 deletions
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 ) {
|