diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 429d51d3ad..03fc9c614b 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -780,7 +780,7 @@ static bool PauseAndLock(Core::System& system) const bool was_unpaused = system.GetCPU().PauseAndLock(); // audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle). - system.GetDSP().GetDSPEmulator()->PauseAndLock(true); + system.GetDSP().GetDSPEmulator()->PauseAndLock(); // 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 59a400ea22..2dbf405065 100644 --- a/Source/Core/Core/DSPEmulator.h +++ b/Source/Core/Core/DSPEmulator.h @@ -22,7 +22,7 @@ public: virtual void Shutdown() = 0; virtual void DoState(PointerWrap& p) = 0; - virtual void PauseAndLock(bool do_lock) = 0; + virtual void PauseAndLock() = 0; virtual void UnpauseAndUnlock() = 0; virtual void DSP_WriteMailBoxHigh(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 325d9cc362..c8fc1317de 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp @@ -242,7 +242,7 @@ u16 DSPHLE::DSP_ReadControlRegister() return m_dsp_control.Hex; } -void DSPHLE::PauseAndLock(bool do_lock) +void DSPHLE::PauseAndLock() { } diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.h b/Source/Core/Core/HW/DSPHLE/DSPHLE.h index 7ba5c12b33..a284d4facd 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.h +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.h @@ -34,7 +34,7 @@ public: void Shutdown() override; bool IsLLE() const override { return false; } void DoState(PointerWrap& p) override; - void PauseAndLock(bool do_lock) override; + void PauseAndLock() override; void UnpauseAndUnlock() override; void DSP_WriteMailBoxHigh(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 9e8ee5baff..ca18e45999 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp @@ -287,23 +287,9 @@ u32 DSPLLE::DSP_UpdateRate() return 12600; // TO BE TWEAKED } -void DSPLLE::PauseAndLock(bool do_lock) +void DSPLLE::PauseAndLock() { - if (do_lock) - { - m_dsp_thread_mutex.lock(); - } - else - { - m_dsp_thread_mutex.unlock(); - - if (m_is_dsp_on_thread) - { - // Signal the DSP thread so it can perform any outstanding work now (if any) - m_ppc_event.Wait(); - m_dsp_event.Set(); - } - } + m_dsp_thread_mutex.lock(); } void DSPLLE::UnpauseAndUnlock() diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/HW/DSPLLE/DSPLLE.h index 3deb3be039..0797308fee 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) override; + void PauseAndLock() override; void UnpauseAndUnlock() override; void DSP_WriteMailBoxHigh(bool cpu_mailbox, u16 value) override;