Changeset 64709 in vbox

Timestamp:

Nov 18, 2016 11:01:35 AM (8 years ago)

Author:

vboxsync

Message:

DrvHostPulseAudio: removed temporary logging

File:

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

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

@@ -176 +176 @@
 {
     if (!pThis)
-    {
-        LogRel(("DEBUG: paSignalWaiter return because of !pThis\n"));
         return;
-    }
-
-    LogRel(("DEBUG: paSignalWaiter set fAbortLoop=true and calling pa_threaded_mainloop_signal()\n"));
+
     pThis->fAbortLoop = true;
     pa_threaded_mainloop_signal(pThis->pMainLoop, 0);
@@ -264 +260 @@
 
     uint64_t u64StartMs = RTTimeMilliTS();
-    LogRel(("DEBUG: entering paWaitForEx\n"));
     while (pa_operation_get_state(pOP) == PA_OPERATION_RUNNING)
     {
@@ -270 +265 @@
         {
             AssertPtr(pThis->pMainLoop);
-            LogRel(("DEBUG: entering pa_threaded_mainloop_wait()\n"));
             pa_threaded_mainloop_wait(pThis->pMainLoop);
-            LogRel(("DEBUG: leaving pa_threaded_mainloop_wait()\n"));
         }
         pThis->fAbortLoop = false;
@@ -282 +275 @@
             break;
         }
-        LogRel(("DEBUG: paWaitForEx next turn (elapsed=%RU64ms)\n", u64ElapsedMs));
     }
 
@@ -993 +985 @@
 {
     if (eol != 0)
-    {
-        LogRel(("DEBUG: paEnumSinkCb return EOL=1\n"));
-        return;
-    }
-    if (!pCtx)
-        LogRel(("DEBUG: paEnumSinkCb return because of !pCtx\n"));
-    AssertPtrReturnVoid(pCtx);
-    if (!pInfo)
-        LogRel(("DEBUG: paEnumSinkCb return because of !pInfo\n"));
-    AssertPtrReturnVoid(pInfo);
-
-    PPULSEAUDIOENUMCBCTX pCbCtx = (PPULSEAUDIOENUMCBCTX)pvUserData;
-    if (!pCbCtx)
-        LogRel(("DEBUG: paEnumSinkCb return because of !pCbCtx\n"));
-    AssertPtrReturnVoid(pCbCtx);
-    if (!pCbCtx->pDrv)
-        LogRel(("DEBUG: paEnumSinkCb return because of !pCbCtx->pDrv\n"));
-    AssertPtrReturnVoid(pCbCtx->pDrv);
-
-    LogRel2(("PulseAudio: Using output sink '%s'\n", pInfo->name));
-
-    /** @todo Store sinks + channel mapping in callback context as soon as we have surround support. */
-    pCbCtx->cDevOut++;
-
-    LogRel(("DEBUG: pa_threaded_mainloop_signal() from paEnumSinkCb\n"));
-    pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
-}
-
-
-static void paEnumSourceCb(pa_context *pCtx, const pa_source_info *pInfo, int eol, void *pvUserData)
-{
-    if (eol != 0)
         return;
 
@@ -1034 +994 @@
     AssertPtrReturnVoid(pCbCtx->pDrv);
 
+    LogRel2(("PulseAudio: Using output sink '%s'\n", pInfo->name));
+
+    /** @todo Store sinks + channel mapping in callback context as soon as we have surround support. */
+    pCbCtx->cDevOut++;
+
+    pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
+}
+
+
+static void paEnumSourceCb(pa_context *pCtx, const pa_source_info *pInfo, int eol, void *pvUserData)
+{
+    if (eol != 0)
+        return;
+
+    AssertPtrReturnVoid(pCtx);
+    AssertPtrReturnVoid(pInfo);
+
+    PPULSEAUDIOENUMCBCTX pCbCtx = (PPULSEAUDIOENUMCBCTX)pvUserData;
+    AssertPtrReturnVoid(pCbCtx);
+    AssertPtrReturnVoid(pCbCtx->pDrv);
+
     LogRel2(("PulseAudio: Using input source '%s'\n", pInfo->name));
 
@@ -1039 +1020 @@
     pCbCtx->cDevIn++;
 
-    LogRel(("DEBUG: pa_threaded_mainloop_signal() from paEnumSourceCb\n"));
     pa_threaded_mainloop_signal(pCbCtx->pDrv->pMainLoop, 0);
 }
@@ -1067 +1047 @@
     }
 
-    LogRel(("DEBUG: pa_threaded_mainloop_signal() from paEnumServerCb\n"));
     pa_threaded_mainloop_signal(pThis->pMainLoop, 0);
 }