From 874e4c2ef2fb1a7117613060f05dc7d7948af141 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Thu, 11 Aug 2011 03:56:58 -0700
Subject: [PATCH] Avoid holding the device lock when it isn't needed

---
 buffer.c | 47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/buffer.c b/buffer.c
index 906d0ac..5060d34 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1000,26 +1000,32 @@ static HRESULT WINAPI DS8Buffer_GetCurrentPosition(IDirectSoundBuffer8 *iface, D
 
     TRACE("(%p)->(%p, %p)\n", iface, playpos, curpos);
 
-    EnterCriticalSection(This->crst);
-    setALContext(This->ctx);
-
     if(This->buffer->numsegs > 1)
     {
         ALint queued = QBUFFERS;
+
+        EnterCriticalSection(This->crst);
+
+        setALContext(This->ctx);
         alGetSourcei(This->source, AL_BUFFERS_QUEUED, &queued);
         checkALError();
+        popALContext();
 
         pos = (This->curidx+This->buffer->numsegs-queued)%This->buffer->numsegs;
         pos *= This->buffer->segsize;
         writecursor = This->curidx * This->buffer->segsize;
+
+        LeaveCriticalSection(This->crst);
     }
     else if(This->primary->SupportedExt[SOFT_BUFFER_SUB_DATA] ||
             This->primary->SupportedExt[SOFT_BUFFER_SAMPLES])
     {
         ALint rwpos[2] = { 0, 0 };
 
+        setALContext(This->ctx);
         alGetSourceiv(This->source, AL_BYTE_RW_OFFSETS_SOFT, rwpos);
         checkALError();
+        popALContext();
 
         pos = rwpos[0];
         writecursor = rwpos[1];
@@ -1029,9 +1035,11 @@ static HRESULT WINAPI DS8Buffer_GetCurrentPosition(IDirectSoundBuffer8 *iface, D
         ALint status = 0;
         ALint ofs = 0;
 
+        setALContext(This->ctx);
         alGetSourcei(This->source, AL_BYTE_OFFSET, &ofs);
         alGetSourcei(This->source, AL_SOURCE_STATE, &status);
         checkALError();
+        popALContext();
 
         pos = ofs;
         if(status == AL_PLAYING)
@@ -1058,9 +1066,6 @@ static HRESULT WINAPI DS8Buffer_GetCurrentPosition(IDirectSoundBuffer8 *iface, D
     if(playpos) *playpos = pos;
     if(curpos)  *curpos = writecursor;
 
-    popALContext();
-    LeaveCriticalSection(This->crst);
-
     return S_OK;
 }
 
@@ -1201,19 +1206,29 @@ static HRESULT WINAPI DS8Buffer_GetStatus(IDirectSoundBuffer8 *iface, DWORD *sta
         return DSERR_INVALIDPARAM;
     }
 
-    EnterCriticalSection(This->crst);
-
-    setALContext(This->ctx);
-    alGetSourcei(This->source, AL_SOURCE_STATE, &state);
-    looping = This->islooping;
     if(This->buffer->numsegs == 1)
+    {
+        setALContext(This->ctx);
+        alGetSourcei(This->source, AL_SOURCE_STATE, &state);
         alGetSourcei(This->source, AL_LOOPING, &looping);
-    else if(state != AL_PLAYING)
-        state = This->isplaying ? AL_PLAYING : AL_PAUSED;
-    checkALError();
-    popALContext();
+        checkALError();
+        popALContext();
+    }
+    else
+    {
+        EnterCriticalSection(This->crst);
 
-    LeaveCriticalSection(This->crst);
+        setALContext(This->ctx);
+        alGetSourcei(This->source, AL_SOURCE_STATE, &state);
+        checkALError();
+        popALContext();
+
+        if(state != AL_PLAYING)
+            state = This->isplaying ? AL_PLAYING : AL_PAUSED;
+        looping = This->islooping;
+
+        LeaveCriticalSection(This->crst);
+    }
 
     *status = 0;
     if((This->buffer->dsbflags&DSBCAPS_LOCDEFER))
-- 
2.11.4.GIT