Changeset 63844 in vbox for trunk

Timestamp:

Sep 15, 2016 9:39:02 AM (8 years ago)

Author:

vboxsync

Message:

Audio/AudioMixer.cpp: Added audioMixerStreamCtlInternal().

File:

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

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

@@ -58 +58 @@
 static int audioMixerSinkUpdateInternal(PAUDMIXSINK pSink);
 
+int audioMixerStreamCtlInternal(PAUDMIXSTREAM pMixStream, PDMAUDIOSTREAMCMD enmCmd, uint32_t fCtl);
 static void audioMixerStreamDestroyInternal(PAUDMIXSTREAM pStream);
 
@@ -644 +645 @@
     RTListForEach(&pSink->lstStreams, pStream, AUDMIXSTREAM, Node)
     {
-        int rc2 = AudioMixerStreamCtl(pStream, enmCmdStream, AUDMIXSTRMCTL_FLAG_NONE);
+        int rc2 = audioMixerStreamCtlInternal(pStream, enmCmdStream, AUDMIXSTRMCTL_FLAG_NONE);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -1540 +1541 @@
 
 /**
- * Controls a mixer stream.
+ * Controls a mixer stream, internal version.
  *
  * @returns IPRT status code.
@@ -1547 +1548 @@
  * @param   fCtl                Additional control flags. Pass 0.
  */
+int audioMixerStreamCtlInternal(PAUDMIXSTREAM pMixStream, PDMAUDIOSTREAMCMD enmCmd, uint32_t fCtl)
+{
+    AssertPtr(pMixStream->pConn);
+    AssertPtr(pMixStream->pStream);
+
+    RT_NOREF(fCtl);
+
+    int rc = pMixStream->pConn->pfnStreamControl(pMixStream->pConn, pMixStream->pStream, enmCmd);
+
+    LogFlowFunc(("[%s] enmCmd=%ld, rc=%Rrc\n", pMixStream->pszName, enmCmd, rc));
+
+    return rc;
+}
+
+/**
+ * Controls a mixer stream.
+ *
+ * @returns IPRT status code.
+ * @param   pMixStream          Mixer stream to control.
+ * @param   enmCmd              Mixer stream command to use.
+ * @param   fCtl                Additional control flags. Pass 0.
+ */
 int AudioMixerStreamCtl(PAUDMIXSTREAM pMixStream, PDMAUDIOSTREAMCMD enmCmd, uint32_t fCtl)
 {
@@ -1557 +1580 @@
         return rc;
 
-    AssertPtr(pMixStream->pConn);
-    AssertPtr(pMixStream->pStream);
-
-    rc = pMixStream->pConn->pfnStreamControl(pMixStream->pConn, pMixStream->pStream, enmCmd);
-
-    LogFlowFunc(("[%s] enmCmd=%ld, rc=%Rrc\n", pMixStream->pszName, enmCmd, rc));
+    rc = audioMixerStreamCtlInternal(pMixStream, enmCmd, fCtl);
 
     int rc2 = RTCritSectLeave(&pMixStream->CritSect);
-    AssertRC(rc2);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
 
     return rc;