From ee684b079896c76edc72b80051dbbc9cbc78b18b Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Thu, 1 Jun 2023 16:56:22 -0700 Subject: [PATCH] DSPEmulator: Remove unused PauseAndLock parameter --- Source/Core/Core/Core.cpp | 2 +- Source/Core/Core/DSPEmulator.h | 2 +- Source/Core/Core/HW/DSPHLE/DSPHLE.cpp | 2 +- Source/Core/Core/HW/DSPHLE/DSPHLE.h | 2 +- Source/Core/Core/HW/DSPLLE/DSPLLE.cpp | 2 +- Source/Core/Core/HW/DSPLLE/DSPLLE.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 3d3166f4ea..e8e738854e 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -812,7 +812,7 @@ static bool PauseAndLock(Core::System& system, bool do_lock, bool unpause_on_unl system.GetExpansionInterface().PauseAndLock(do_lock, false); // audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle). - system.GetDSP().GetDSPEmulator()->PauseAndLock(do_lock, false); + system.GetDSP().GetDSPEmulator()->PauseAndLock(do_lock); // video has to come after CPU, because CPU thread can wait for video thread // (s_efbAccessRequested). diff --git a/Source/Core/Core/DSPEmulator.h b/Source/Core/Core/DSPEmulator.h index 25c13975f6..b3b733817b 100644 --- a/Source/Core/Core/DSPEmulator.h +++ b/Source/Core/Core/DSPEmulator.h @@ -18,7 +18,7 @@ public: virtual void Shutdown() = 0; virtual void DoState(PointerWrap& p) = 0; - virtual void PauseAndLock(bool do_lock, bool unpause_on_unlock = true) = 0; + virtual void PauseAndLock(bool do_lock) = 0; virtual void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) = 0; virtual void DSP_WriteMailBoxLow(bool cpu_mailbox, u16 value) = 0; diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp index 3360b951e4..c1cceb58a9 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp @@ -240,7 +240,7 @@ u16 DSPHLE::DSP_ReadControlRegister() return m_dsp_control.Hex; } -void DSPHLE::PauseAndLock(bool do_lock, bool unpause_on_unlock) +void DSPHLE::PauseAndLock(bool do_lock) { } } // namespace DSP::HLE diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/HW/DSPHLE/DSPHLE.h index 997529c64e..d03c5be5cc 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.h +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.h @@ -26,7 +26,7 @@ public: void Shutdown() override; bool IsLLE() const override { return false; } void DoState(PointerWrap& p) override; - void PauseAndLock(bool do_lock, bool unpause_on_unlock = true) override; + void PauseAndLock(bool do_lock) override; void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override; void DSP_WriteMailBoxLow(bool cpu_mailbox, u16 value) override; diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp index 5f66cbd5d2..059926c7ff 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -288,7 +288,7 @@ u32 DSPLLE::DSP_UpdateRate() return 12600; // TO BE TWEAKED } -void DSPLLE::PauseAndLock(bool do_lock, bool unpause_on_unlock) +void DSPLLE::PauseAndLock(bool do_lock) { if (do_lock) { diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/HW/DSPLLE/DSPLLE.h index 669f489ed4..1d92aad81c 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.h +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.h @@ -26,7 +26,7 @@ public: void Shutdown() override; bool IsLLE() const override { return true; } void DoState(PointerWrap& p) override; - void PauseAndLock(bool do_lock, bool unpause_on_unlock = true) override; + void PauseAndLock(bool do_lock) override; void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override; void DSP_WriteMailBoxLow(bool cpu_mailbox, u16 value) override;