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

SPU: Fix adsr_volume read for pending key-on voice 

Fixes cutscene audio in Spyro 2, probably others.
This commit is contained in:
Connor McLaughlin 2020-04-19 18:19:46 +10:00
parent 13903c2abd
commit 045c4d1745
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/spu.cpp
View File

@ -150,9 +150,6 @@ bool SPU::DoState(StateWrapper& sw)
UpdateTransferEvent(); UpdateTransferEvent();
} }
//for (u32 i = 0; i < NUM_REVERB_REGS; i++)
//Log_WarningPrintf("Reverb[%u] = 0x%04X", i, m_reverb_registers.rev[i]);
return !sw.HasError(); return !sw.HasError();
} }
@ -529,12 +526,10 @@ u16 SPU::ReadVoiceRegister(u32 offset)
const u32 voice_index = (offset / 0x10); //((offset >> 4) & 0x1F); const u32 voice_index = (offset / 0x10); //((offset >> 4) & 0x1F);
Assert(voice_index < 24); Assert(voice_index < 24);
// ADSR volume needs to be updated when reading. A voice might be off as well, but key on is pending.
const Voice& voice = m_voices[voice_index]; const Voice& voice = m_voices[voice_index];
if (reg_index >= 6 && voice.IsOn()) if (reg_index >= 6 && (voice.IsOn() || m_key_on_register & (1u << voice_index)))
{
// adsr volume needs to be updated when reading
m_tick_event->InvokeEarly(); m_tick_event->InvokeEarly();
}
Log_TracePrintf("Read voice %u register %u -> 0x%02X", voice_index, reg_index, voice.regs.index[reg_index]); Log_TracePrintf("Read voice %u register %u -> 0x%02X", voice_index, reg_index, voice.regs.index[reg_index]);
return voice.regs.index[reg_index]; return voice.regs.index[reg_index];