ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPU: Fix sustain step being ignored

This commit is contained in:
Connor McLaughlin 2019-11-15 16:42:25 +10:00
parent 4e9d5b77f8
commit d9c27c4ee3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/spu.cpp
View File

@ -667,8 +667,8 @@ void SPU::Voice::SetADSRPhase(ADSRPhase phase)
break; break;
case ADSRPhase::Sustain: case ADSRPhase::Sustain:
adsr_target.level = regs.adsr.sustain_direction_decrease ? -1 : 1; adsr_target.level = 0;
adsr_target.step = 0; adsr_target.step = regs.adsr.sustain_step;
adsr_target.shift = regs.adsr.sustain_shift; adsr_target.shift = regs.adsr.sustain_shift;
adsr_target.decreasing = regs.adsr.sustain_direction_decrease; adsr_target.decreasing = regs.adsr.sustain_direction_decrease;
adsr_target.exponential = regs.adsr.sustain_exponential; adsr_target.exponential = regs.adsr.sustain_exponential;
@ -687,9 +687,9 @@ void SPU::Voice::SetADSRPhase(ADSRPhase phase)
} }
const s16 step = adsr_target.decreasing ? (-8 + adsr_target.step) : (7 - adsr_target.step); const s16 step = adsr_target.decreasing ? (-8 + adsr_target.step) : (7 - adsr_target.step);
adsr_ticks = 1 << std::max<s16>(0, adsr_target.shift - 11); adsr_ticks = 1 << std::max<s16>(0, static_cast<s16>(ZeroExtend16(adsr_target.shift)) - 11);
adsr_ticks_remaining = adsr_ticks; adsr_ticks_remaining = adsr_ticks;
adsr_step = step << std::max<s16>(0, 11 - adsr_target.shift); adsr_step = step << std::max<s16>(0, 11 - static_cast<s16>(ZeroExtend16(adsr_target.shift)));
} }
void SPU::Voice::TickADSR() void SPU::Voice::TickADSR()