From eb49290dabd5ca317337663ff7e8b25a311b83a8 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 26 Feb 2020 04:58:02 -0800
Subject: Remove unnecessary locks now that the mixer doesn't require one

---
 alc/backends/wasapi.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'alc/backends/wasapi.cpp')

diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp
index f97c8636..4addad1d 100644
--- a/alc/backends/wasapi.cpp
+++ b/alc/backends/wasapi.cpp
@@ -715,10 +715,11 @@ FORCE_ALIGN int WasapiPlayback::mixerProc()
         hr = mRender->GetBuffer(len, &buffer);
         if(SUCCEEDED(hr))
         {
-            std::unique_lock<WasapiPlayback> dlock{*this};
-            aluMixData(mDevice, buffer, len, mFrameStep);
-            mPadding.store(written + len, std::memory_order_relaxed);
-            dlock.unlock();
+            {
+                std::lock_guard<std::recursive_mutex> _{mMutex};
+                aluMixData(mDevice, buffer, len, mFrameStep);
+                mPadding.store(written + len, std::memory_order_relaxed);
+            }
             hr = mRender->ReleaseBuffer(len, 0);
         }
         if(FAILED(hr))
@@ -1164,7 +1165,7 @@ ClockLatency WasapiPlayback::getClockLatency()
 {
     ClockLatency ret;
 
-    std::lock_guard<WasapiPlayback> _{*this};
+    std::lock_guard<std::recursive_mutex> _{mMutex};
     ret.ClockTime = GetDeviceClockTime(mDevice);
     ret.Latency  = std::chrono::seconds{mPadding.load(std::memory_order_relaxed)};
     ret.Latency /= mDevice->Frequency;
-- 
cgit v1.2.3