Changeset 63845 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Sep 15, 2016 9:42:45 AM (8 years ago)

Author:

vboxsync

Message:

Audio/AudioMixer.cpp: If the sink is running, make sure that an just added audio stream also is running (enabled).

File:

• trunk/src/VBox/Devices/Audio/AudioMixer.cpp (modified) (1 diff)

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

@@ -476 +476 @@
         /** @todo Check if stream already is assigned to (another) sink. */
 
-        /* Apply the sink's combined volume to the stream. */
-        AssertPtr(pStream->pConn);
-        rc = pStream->pConn->pfnStreamSetVolume(pStream->pConn, pStream->pStream, &pSink->VolumeCombined);
-
-        /* Save pointer to sink the stream is attached to. */
-        pStream->pSink = pSink;
-
-        /* Append stream to sink's list. */
-        RTListAppend(&pSink->lstStreams, &pStream->Node);
-        pSink->cStreams++;
+        /* If the sink is running, make sure that the added stream also is enabled. */
+        if (pSink->fStatus & AUDMIXSINK_STS_RUNNING)
+            rc = audioMixerStreamCtlInternal(pStream, PDMAUDIOSTREAMCMD_ENABLE, AUDMIXSTRMCTL_FLAG_NONE);
+
+        if (RT_SUCCESS(rc))
+        {
+            /* Apply the sink's combined volume to the stream. */
+            rc = pStream->pConn->pfnStreamSetVolume(pStream->pConn, pStream->pStream, &pSink->VolumeCombined);
+            AssertRC(rc);
+        }
+
+        if (RT_SUCCESS(rc))
+        {
+            /* Save pointer to sink the stream is attached to. */
+            pStream->pSink = pSink;
+
+            /* Append stream to sink's list. */
+            RTListAppend(&pSink->lstStreams, &pStream->Node);
+            pSink->cStreams++;
+        }
     }