From 52a003e9bb7c870f26436b38e62edc96385805dc Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 7 Oct 2019 23:22:06 -0700
Subject: Avoid raw lock/unlock calls

---
 alc/backends/oss.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/alc/backends/oss.cpp b/alc/backends/oss.cpp
index 1e3ad28b..5ab07dbe 100644
--- a/alc/backends/oss.cpp
+++ b/alc/backends/oss.cpp
@@ -279,7 +279,7 @@ int OSSPlayback::mixerProc()
 
     const ALuint frame_size{mDevice->frameSizeFromFmt()};
 
-    lock();
+    std::unique_lock<OSSPlayback> dlock{*this};
     while(!mKillNow.load(std::memory_order_acquire) &&
           mDevice->Connected.load(std::memory_order_acquire))
     {
@@ -287,9 +287,9 @@ int OSSPlayback::mixerProc()
         pollitem.fd = mFd;
         pollitem.events = POLLOUT;
 
-        unlock();
+        dlock.unlock();
         int pret{poll(&pollitem, 1, 1000)};
-        lock();
+        dlock.lock();
         if(pret < 0)
         {
             if(errno == EINTR || errno == EAGAIN)
@@ -324,7 +324,6 @@ int OSSPlayback::mixerProc()
             write_ptr += wrote;
         }
     }
-    unlock();
 
     return 0;
 }
-- 
cgit v1.2.3