diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-02-05 11:28:24 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-02-05 11:28:24 +0000 |
| commit | ae675e5a1276a5da35de6c2c9e8c302263c6922f (patch) | |
| tree | c03778f11f9176ddff384e2b249524db2225d13d /plugins | |
| parent | a73bf1c4a0eae9b06cd5ce369222dbf3237c1e62 (diff) | |
| download | pcsxr-ae675e5a1276a5da35de6c2c9e8c302263c6922f.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@62943 e17a0e51-4ae3-4d35-97c3-1a29b211df97
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 ) {
|