diff --git a/rpcs3/Emu/Cell/Modules/cellRec.cpp b/rpcs3/Emu/Cell/Modules/cellRec.cpp index d1739bf135..4d702b0b31 100644 --- a/rpcs3/Emu/Cell/Modules/cellRec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRec.cpp @@ -176,8 +176,7 @@ public: { cellRec.notice("Stopping video sink. flush=%d", flush); - std::lock_guard lock_video(m_video_mtx); - std::lock_guard lock_audio(m_audio_mtx); + std::scoped_lock lock(m_video_mtx, m_audio_mtx); m_flush = flush; m_paused = false; m_frames_to_encode.clear(); @@ -189,8 +188,7 @@ public: { cellRec.notice("Pausing video sink. flush=%d", flush); - std::lock_guard lock_video(m_video_mtx); - std::lock_guard lock_audio(m_audio_mtx); + std::scoped_lock lock(m_video_mtx, m_audio_mtx); m_flush = flush; m_paused = true; } @@ -199,8 +197,7 @@ public: { cellRec.notice("Resuming video sink"); - std::lock_guard lock_video(m_video_mtx); - std::lock_guard lock_audio(m_audio_mtx); + std::scoped_lock lock(m_video_mtx, m_audio_mtx); m_flush = false; m_paused = false; } diff --git a/rpcs3/util/media_utils.cpp b/rpcs3/util/media_utils.cpp index 94a922acbe..0b9d5ed4bb 100644 --- a/rpcs3/util/media_utils.cpp +++ b/rpcs3/util/media_utils.cpp @@ -781,8 +781,7 @@ namespace utils m_thread.reset(); } - std::lock_guard lock_video(m_video_mtx); - std::lock_guard lock_audio(m_audio_mtx); + std::scoped_lock lock(m_video_mtx, m_audio_mtx); m_frames_to_encode.clear(); m_samples_to_encode.clear(); has_error = false; diff --git a/rpcs3/util/video_provider.cpp b/rpcs3/util/video_provider.cpp index 44669307a0..1e5b747d5c 100644 --- a/rpcs3/util/video_provider.cpp +++ b/rpcs3/util/video_provider.cpp @@ -45,8 +45,7 @@ namespace utils return false; } - std::lock_guard lock_video(m_video_mutex); - std::lock_guard lock_audio(m_audio_mutex); + std::scoped_lock lock(m_video_mutex, m_audio_mutex); if (m_video_sink) { @@ -80,9 +79,7 @@ namespace utils void video_provider::set_pause_time_us(usz pause_time_us) { - std::lock_guard lock_video(m_video_mutex); - std::lock_guard lock_audio(m_audio_mutex); - + std::scoped_lock lock(m_video_mutex, m_audio_mutex); m_pause_time_us = pause_time_us; }