Changeset 88918 in vbox

Timestamp:

May 6, 2021 10:17:08 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

144253

Message:

Audio: s/AudioMixerSinkCtl/AudioMixerSinkEnable/ bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (3 diffs)
• AudioMixer.h (modified) (1 diff)
• DevHdaStream.cpp (modified) (1 diff)
• DevIchAc97.cpp (modified) (1 diff)
• DevSB16.cpp (modified) (1 diff)

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

@@ -661 +661 @@
 
 /**
- * Controls a mixer sink.
+ * Enables or disables a mixer sink.
  *
  * @returns VBox status code.
@@ -667 +667 @@
  *          Individual driver errors are suppressed and ignored.
  * @param   pSink       Mixer sink to control.
- * @param   enmCmd      The command to to perform on the sink and its streams.
- */
-int AudioMixerSinkCtl(PAUDMIXSINK pSink, PDMAUDIOSTREAMCMD enmCmd)
+ * @param   fEnable     Whether to enable or disable the sink.
+ */
+int AudioMixerSinkEnable(PAUDMIXSINK pSink, bool fEnable)
 {
     AssertPtrReturn(pSink, VERR_INVALID_POINTER);
-
-    /* Only ENABLE/DISABLE is implemented. */
-    AssertMsgReturn(   enmCmd == PDMAUDIOSTREAMCMD_ENABLE
-                    || enmCmd == PDMAUDIOSTREAMCMD_DISABLE,
-                   ("enmSinkCmd=%d (%s)\n", enmCmd, PDMAudioStrmCmdGetName(enmCmd)),
-                    VERR_INVALID_FUNCTION);
+    PDMAUDIOSTREAMCMD const enmCmd = fEnable ? PDMAUDIOSTREAMCMD_ENABLE : PDMAUDIOSTREAMCMD_DISABLE;
 
     int rc = RTCritSectEnter(&pSink->CritSect);
@@ -719 +714 @@
             }
         }
+        else
+            AssertFailed();
 
         /*
          * Update the sink status.
          */
-        switch (enmCmd)
-        {
-            case PDMAUDIOSTREAMCMD_ENABLE:
-                /* Make sure to clear any other former flags again by assigning AUDMIXSINK_STS_RUNNING directly. */
-                pSink->fStatus = AUDMIXSINK_STS_RUNNING;
-                break;
-
-            case PDMAUDIOSTREAMCMD_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;
-                }
-                break;
-
-            default:
-                AssertFailed(/*impossible!*/);
+        if (fEnable)
+        {
+            /* Make sure to clear any other former flags again by assigning AUDMIXSINK_STS_RUNNING directly. */
+            pSink->fStatus = AUDMIXSINK_STS_RUNNING;
+        }
+        else
+        {
+            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;
+            }
         }
     }

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

@@ -231 +231 @@
 int     AudioMixerSinkCreateStream(PAUDMIXSINK pSink, PPDMIAUDIOCONNECTOR pConnector, PPDMAUDIOSTREAMCFG pCfg,
                                    PPDMDEVINS pDevIns, PAUDMIXSTREAM *ppStream);
-int     AudioMixerSinkCtl(PAUDMIXSINK pSink, PDMAUDIOSTREAMCMD enmCmd);
+int     AudioMixerSinkEnable(PAUDMIXSINK pSink, bool fEnable);
 void AudioMixerSinkDestroy(PAUDMIXSINK pSink, PPDMDEVINS pDevIns);
 uint32_t AudioMixerSinkGetReadable(PAUDMIXSINK pSink);

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

@@ -903 +903 @@
     if (   pStreamR3->pMixSink
         && pStreamR3->pMixSink->pMixSink)
-        rc = AudioMixerSinkCtl(pStreamR3->pMixSink->pMixSink, fEnable ? PDMAUDIOSTREAMCMD_ENABLE : PDMAUDIOSTREAMCMD_DISABLE);
+        rc = AudioMixerSinkEnable(pStreamR3->pMixSink->pMixSink, fEnable);
     else
         rc = VINF_SUCCESS;

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

@@ -1024 +1024 @@
     {
         /* First, enable or disable the stream and the stream's sink, if any. */
-        rc = AudioMixerSinkCtl(ichac97R3IndexToSink(pThisCC, pStream->u8SD),
-                               fEnable ? PDMAUDIOSTREAMCMD_ENABLE : PDMAUDIOSTREAMCMD_DISABLE);
+        rc = AudioMixerSinkEnable(ichac97R3IndexToSink(pThisCC, pStream->u8SD), fEnable);
     }
 

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

@@ -2225 +2225 @@
 
     /* First, enable or disable the stream and the stream's sink. */
-    int rc = AudioMixerSinkCtl(sb16StreamIndexToSink(pThis, pStream->uIdx),
-                               fEnable ? PDMAUDIOSTREAMCMD_ENABLE : PDMAUDIOSTREAMCMD_DISABLE);
+    int rc = AudioMixerSinkEnable(sb16StreamIndexToSink(pThis, pStream->uIdx), fEnable);
     AssertRCReturn(rc, rc);