Changeset 58590 in vbox

Timestamp:

Nov 5, 2015 4:54:55 PM (9 years ago)

Author:

vboxsync

Message:

Audio/PulseAudio: fix for r103940

File:

• trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp

@@ -216 +216 @@
     {
         uint64_t u64StartMs = RTTimeMilliTS();
-        uint64_t u64ElapsedMs;
-
         while (pa_operation_get_state(pOP) == PA_OPERATION_RUNNING)
         {
-            pa_threaded_mainloop_wait(g_pMainLoop);
-
-            u64ElapsedMs = RTTimeMilliTS() - u64StartMs;
+            if (!g_fAbortMainLoop)
+                pa_threaded_mainloop_wait(g_pMainLoop);
+            g_fAbortMainLoop = false;
+
+            uint64_t u64ElapsedMs = RTTimeMilliTS() - u64StartMs;
             if (u64ElapsedMs >= cMsTimeout)
             {
@@ -317 +317 @@
         drvHostPulseAudioAbortMainLoop();
     else
-         drvHostPulseAudioError(pStrm->pDrv, "Failed to finish stream operation");
+        drvHostPulseAudioError(pStrm->pDrv, "Failed to finish stream operation");
 }
 
@@ -400 +400 @@
 
         /* Wait until the stream is ready. */
-        pa_stream_state_t sstate;
         for (;;)
         {
             if (!g_fAbortMainLoop)
                 pa_threaded_mainloop_wait(g_pMainLoop);
-
-            sstate = pa_stream_get_state(pStream);
+            g_fAbortMainLoop = false;
+
+            pa_stream_state_t sstate = pa_stream_get_state(pStream);
             if (sstate == PA_STREAM_READY)
                 break;
@@ -433 +433 @@
                      pBufAttr->maxlength, pBufAttr->tlength, pBufAttr->prebuf, pBufAttr->minreq));
 
-        pa_threaded_mainloop_unlock(g_pMainLoop);
     }
     while (0);
 
+    if (   RT_FAILURE(rc)
+        && pStream)
+        pa_stream_disconnect(pStream);
+
+    pa_threaded_mainloop_unlock(g_pMainLoop);
+
     if (RT_FAILURE(rc))
     {
-        if (pStream)
-            pa_stream_disconnect(pStream);
-
-        pa_threaded_mainloop_unlock(g_pMainLoop);
-
         if (pStream)
             pa_stream_unref(pStream);
@@ -512 +512 @@
         for (;;)
         {
-            pa_context_state_t cstate;
             if (!g_fAbortMainLoop)
                 pa_threaded_mainloop_wait(g_pMainLoop);
-
-            cstate = pa_context_get_state(g_pContext);
+            g_fAbortMainLoop = false;
+
+            pa_context_state_t cstate = pa_context_get_state(g_pContext);
             if (cstate == PA_CONTEXT_READY)
                 break;