Changeset 63828 in vbox

Timestamp:

Sep 14, 2016 9:43:14 AM (8 years ago)

Author:

vboxsync

Message:

Logging, some simplifications.

File:

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

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

@@ -661 +661 @@
     }
 
+    LogFlowFunc(("[%s]: enmCmd=%d, fStatus=0x%x, rc=%Rrc\n", pSink->pszName, enmSinkCmd, pSink->fStatus, rc));
+
     /* Not running anymore? Reset. */
     if (!(pSink->fStatus & AUDMIXSINK_STS_RUNNING))
         audioMixerSinkReset(pSink);
-
-    LogFlowFunc(("[%s]: enmCmd=%d, fStatus=0x%x, rc=%Rrc\n", pSink->pszName, enmSinkCmd, pSink->fStatus, rc));
 
     int rc2 = RTCritSectLeave(&pSink->CritSect);
@@ -996 +996 @@
 
         PDMAUDIOSTRMSTS strmSts = pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream);
-        fClean &= !(strmSts & PDMAUDIOSTRMSTS_FLAG_DATA_READABLE);
+
+        /* Still some data available? Then sink is not clean (yet). */
+        if (strmSts & PDMAUDIOSTRMSTS_FLAG_DATA_READABLE)
+            fClean = false;
     }
 
@@ -1018 +1021 @@
 #endif
 
-    Log3Func(("[%s] cbRead=%RU32, fStatus=0x%x, rc=%Rrc\n", pSink->pszName, cbRead, pSink->fStatus, rc));
+    Log3Func(("[%s] cbRead=%RU32, fClean=%RTbool, fStatus=0x%x, rc=%Rrc\n", pSink->pszName, cbRead, fClean, pSink->fStatus, rc));
 
     int rc2 = RTCritSectLeave(&pSink->CritSect);
@@ -1111 +1114 @@
         return;
 
-    LogFunc(("%s\n", pSink->pszName));
+    LogFunc(("[%s]\n", pSink->pszName));
 
     if (pSink->enmDir == AUDMIXSINKDIR_INPUT)