Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-30 11:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPU: Add CD audio volume control

Browse source
This commit is contained in:
Connor McLaughlin 2019-10-20 19:46:35 +10:00
parent 140d63c674
commit 884378045d
2 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/core/spu.cpp
View file

@ -37,6 +37,8 @@ void SPU::Reset()
m_irq_address = 0; m_irq_address = 0;
m_main_volume_left.bits = 0; m_main_volume_left.bits = 0;
m_main_volume_right.bits = 0; m_main_volume_right.bits = 0;
m_cd_audio_volume_left = 0;
m_cd_audio_volume_right = 0;
m_key_on_register = 0; m_key_on_register = 0;
m_key_off_register = 0; m_key_off_register = 0;
m_endx_register = 0; m_endx_register = 0;
@ -74,6 +76,8 @@ bool SPU::DoState(StateWrapper& sw)
sw.Do(&m_irq_address); sw.Do(&m_irq_address);
sw.Do(&m_main_volume_left.bits); sw.Do(&m_main_volume_left.bits);
sw.Do(&m_main_volume_right.bits); sw.Do(&m_main_volume_right.bits);
sw.Do(&m_cd_audio_volume_left);
sw.Do(&m_cd_audio_volume_right);
sw.Do(&m_key_on_register); sw.Do(&m_key_on_register);
sw.Do(&m_key_off_register); sw.Do(&m_key_off_register);
sw.Do(&m_endx_register); sw.Do(&m_endx_register);
@ -159,6 +163,12 @@ u16 SPU::ReadRegister(u32 offset)
// Log_DebugPrintf("SPU status register -> 0x%04X", ZeroExtend32(m_SPUCNT.bits)); // Log_DebugPrintf("SPU status register -> 0x%04X", ZeroExtend32(m_SPUCNT.bits));
return m_SPUSTAT.bits; return m_SPUSTAT.bits;
case 0x1F801DB0 - SPU_BASE:
return m_cd_audio_volume_left;
case 0x1F801DB2 - SPU_BASE:
return m_cd_audio_volume_right;
default: default:
Log_ErrorPrintf("Unknown SPU register read: offset 0x%X (address 0x%08X)", offset, offset | SPU_BASE); Log_ErrorPrintf("Unknown SPU register read: offset 0x%X (address 0x%08X)", offset, offset | SPU_BASE);
return UINT16_C(0xFFFF); return UINT16_C(0xFFFF);
@ -327,6 +337,22 @@ void SPU::WriteRegister(u32 offset, u16 value)
m_system->Synchronize(); m_system->Synchronize();
m_reverb_on_register = (m_reverb_on_register & 0x0000FFFF) | (ZeroExtend32(value) << 16); m_reverb_on_register = (m_reverb_on_register & 0x0000FFFF) | (ZeroExtend32(value) << 16);
} }
break;
case 0x1F801DB0 - SPU_BASE:
{
Log_DebugPrintf("SPU left cd audio register <- 0x%04X", ZeroExtend32(value));
m_system->Synchronize();
m_cd_audio_volume_left = value;
}
break;
case 0x1F801DB2 - SPU_BASE:
{
Log_DebugPrintf("SPU right cd audio register <- 0x%04X", ZeroExtend32(value));
m_system->Synchronize();
m_cd_audio_volume_right = value;
}
break; break;
// read-only registers // read-only registers
@ -868,11 +894,12 @@ void SPU::GenerateSample()
} }
// Mix in CD audio. // Mix in CD audio.
// TODO: Volume control.
if (m_SPUCNT.cd_audio_enable && !m_cd_audio_buffer.IsEmpty()) if (m_SPUCNT.cd_audio_enable && !m_cd_audio_buffer.IsEmpty())
{ {
left_sum += s32(m_cd_audio_buffer.Pop()); const s32 left = m_cd_audio_buffer.Pop();
right_sum += s32(m_cd_audio_buffer.Pop()); const s32 right = m_cd_audio_buffer.Pop();
left_sum += ApplyVolume(left, m_cd_audio_volume_left);
right_sum += ApplyVolume(right, m_cd_audio_volume_right);
} }
// Apply main volume before clamping. // Apply main volume before clamping.
@ -957,9 +984,11 @@ void SPU::DrawDebugWindow()
ImGui::TextColored(m_SPUCNT.cd_audio_enable ? active_color : inactive_color, ImGui::TextColored(m_SPUCNT.cd_audio_enable ? active_color : inactive_color,
m_SPUCNT.cd_audio_enable ? "Enabled" : "Disabled"); m_SPUCNT.cd_audio_enable ? "Enabled" : "Disabled");
ImGui::SameLine(offsets[1]); ImGui::SameLine(offsets[1]);
ImGui::TextColored(m_SPUCNT.cd_audio_enable ? active_color : inactive_color, "Left Volume: %d%%", 0, 0); ImGui::TextColored(m_SPUCNT.cd_audio_enable ? active_color : inactive_color, "Left Volume: %d%%",
ApplyVolume(100, m_cd_audio_volume_left));
ImGui::SameLine(offsets[3]); ImGui::SameLine(offsets[3]);
ImGui::TextColored(m_SPUCNT.cd_audio_enable ? active_color : inactive_color, "Right Volume: %d%%", 0, 0); ImGui::TextColored(m_SPUCNT.cd_audio_enable ? active_color : inactive_color, "Right Volume: %d%%",
ApplyVolume(100, m_cd_audio_volume_left));
} }
// draw voice states // draw voice states

3
src/core/spu.h
View file

@ -290,6 +290,9 @@ private:
VolumeRegister m_main_volume_left = {}; VolumeRegister m_main_volume_left = {};
VolumeRegister m_main_volume_right = {}; VolumeRegister m_main_volume_right = {};
s16 m_cd_audio_volume_left = 0;
s16 m_cd_audio_volume_right = 0;
u32 m_key_on_register = 0; u32 m_key_on_register = 0;
u32 m_key_off_register = 0; u32 m_key_off_register = 0;
u32 m_endx_register = 0; u32 m_endx_register = 0;