diff --git a/pcsx2/SPU2/Mixer.cpp b/pcsx2/SPU2/Mixer.cpp index b88c7324de..72b4b31c7c 100644 --- a/pcsx2/SPU2/Mixer.cpp +++ b/pcsx2/SPU2/Mixer.cpp @@ -633,7 +633,7 @@ __forceinline Ext = StereoOut32::Empty; else { - Ext = clamp_mix(ApplyVolume(Ext, Cores[0].MasterVol)); + Ext = ApplyVolume(clamp_mix(Ext), Cores[0].MasterVol); } // Commit Core 0 output to ram before mixing Core 1: @@ -657,8 +657,7 @@ __forceinline } else { - Out.Left = ApplyVolume(Out.Left, Cores[1].MasterVol.Left.Value); - Out.Right = ApplyVolume(Out.Right, Cores[1].MasterVol.Right.Value); + Out = ApplyVolume(clamp_mix(Out), Cores[1].MasterVol); } // For a long time PCSX2 has had its output volume halved by diff --git a/pcsx2/SaveState.h b/pcsx2/SaveState.h index 2153a0908b..bc79047f38 100644 --- a/pcsx2/SaveState.h +++ b/pcsx2/SaveState.h @@ -37,7 +37,7 @@ enum class FreezeAction // [SAVEVERSION+] // This informs the auto updater that the users savestates will be invalidated. -static const u32 g_SaveVersion = (0x9A46 << 16) | 0x0000; +static const u32 g_SaveVersion = (0x9A47 << 16) | 0x0000; // the freezing data between submodules and core