Changeset 63846 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 15, 2016 9:44:37 AM (8 years ago)

Author:

vboxsync

Message:

Audio/AudioMixer.cpp: Logging.

File:

• trunk/src/VBox/Devices/Audio/AudioMixer.cpp (modified) (6 diffs)

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

@@ -1304 +1304 @@
         AssertPtr(pConn);
 
-        uint32_t cCaptured = 0;
+        uint32_t cProc = 0;
 
         int rc2 = pConn->pfnStreamIterate(pConn, pStream);
@@ -1311 +1311 @@
             if (pSink->enmDir == AUDMIXSINKDIR_INPUT)
             {
-                rc = pConn->pfnStreamCapture(pConn, pStream, &cCaptured);
+                rc = pConn->pfnStreamCapture(pConn, pStream, &cProc);
                 if (RT_FAILURE(rc2))
                 {
@@ -1320 +1320 @@
                 }
 
-                if (cCaptured)
+                if (cProc)
                     pSink->fStatus |= AUDMIXSINK_STS_DIRTY;
             }
             else if (pSink->enmDir == AUDMIXSINKDIR_OUTPUT)
             {
-                rc2 = pConn->pfnStreamPlay(pConn, pStream, NULL /* cPlayed */);
+                rc2 = pConn->pfnStreamPlay(pConn, pStream, &cProc);
                 if (RT_FAILURE(rc2))
                 {
@@ -1386 +1386 @@
         }
 
-        Log3Func(("\t%s: cCaptured=%RU32\n", pStream->szName, cCaptured));
-    }
+        Log3Func(("\t%s: cProc=%RU32, rc2=%Rrc\n", pStream->szName, cProc, rc2));
+    }
+
+    Log3Func(("[%s] fPendingDisable=%RTbool, %RU8/%RU8 streams disabled\n",
+              RT_BOOL(pSink->fStatus & AUDMIXSINK_STS_PENDING_DISABLE), pSink->pszName, cStreamsDisabled, pSink->cStreams));
+
+    /* Update last updated timestamp. */
+    pSink->tsLastUpdatedMS = RTTimeMilliTS();
 
     /* All streams disabled and the sink is in pending disable mode? */
@@ -1395 +1401 @@
         audioMixerSinkReset(pSink);
     }
-
-    /* Update last updated timestamp. */
-    pSink->tsLastUpdatedMS = RTTimeMilliTS();
 
     Log3Func(("[%s] cbReadable=%RU32, cbWritable=%RU32, rc=%Rrc\n",
@@ -1516 +1519 @@
         if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED))
         {
-            Log3Func(("\t%s: Stream '%s' Disabled, skipping ...\n", pMixStream->pszName, pMixStream->pStream->szName));
+            Log3Func(("\t%s: Stream '%s' disabled, skipping ...\n", pMixStream->pszName, pMixStream->pStream->szName));
             continue;
         }