Changeset 68268 in vbox

Timestamp:

Aug 3, 2017 7:56:01 AM (7 years ago)

Author:

vboxsync

Message:

Audio/AudioMixer.cpp: Only apply AUDMIXSINK_STS_PENDING_DISABLE when AUDMIXSINK_STS_RUNNING is set in AudioMixerSinkCtl(), logging.

File:

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

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

@@ -727 +727 @@
     else if (enmSinkCmd == AUDMIXSINKCMD_DISABLE)
     {
-        /* Set the sink in a pending disable state first.
-         * The final status (disabled) will be set in the sink's iteration. */
-        pSink->fStatus |= AUDMIXSINK_STS_PENDING_DISABLE;
+        if (pSink->fStatus & AUDMIXSINK_STS_RUNNING)
+        {
+            /* Set the sink in a pending disable state first.
+             * The final status (disabled) will be set in the sink's iteration. */
+            pSink->fStatus |= AUDMIXSINK_STS_PENDING_DISABLE;
+        }
     }
 
@@ -1031 +1034 @@
     int rc2 = RTCritSectEnter(&pSink->CritSect);
     if (RT_FAILURE(rc2))
-        return 0;
-
-    bool fIsActive = (pSink->fStatus & AUDMIXSINK_STS_RUNNING);
+        return false;
+
+    bool fIsActive = pSink->fStatus & AUDMIXSINK_STS_RUNNING;
+    /* Note: AUDMIXSINK_STS_PENDING_DISABLE implies AUDMIXSINK_STS_RUNNING. */
+
+    Log3Func(("[%s] fActive=%RTbool\n", pSink->pszName, fIsActive));
 
     rc2 = RTCritSectLeave(&pSink->CritSect);
@@ -1315 +1321 @@
     int rc2 = RTCritSectEnter(&pSink->CritSect);
     AssertRC(rc2);
+
+    LogFlowFunc(("[%s]\n", pSink->pszName));
 
     audioMixerSinkReset(pSink);