Changeset 82597 in vbox

Timestamp:

Dec 16, 2019 6:42:38 PM (5 years ago)

Author:

vboxsync

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

135483

Message:

Audio/Mixer: Modularized code a bit more by adding audioMixerSinkInit() and audioMixerAddSinkInternal(), to match audioMixerSinkDestroyInternal() + audioMixerRemoveSinkInternal().

File:

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

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

@@ -90 +90 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
+static int audioMixerAddSinkInternal(PAUDIOMIXER pMixer, PAUDMIXSINK pSink);
 static int audioMixerRemoveSinkInternal(PAUDIOMIXER pMixer, PAUDMIXSINK pSink);
 
+static int audioMixerSinkInit(PAUDMIXSINK pSink, PAUDIOMIXER pMixer, const char *pcszName, AUDMIXSINKDIR enmDir);
 static void audioMixerSinkDestroyInternal(PAUDMIXSINK pSink);
 static int audioMixerSinkUpdateVolume(PAUDMIXSINK pSink, const PPDMAUDIOVOLUME pVolMaster);
@@ -184 +186 @@
     if (pSink)
     {
-        pSink->pszName = RTStrDup(pszName);
-        if (!pSink->pszName)
-            rc = VERR_NO_MEMORY;
-
+        rc = audioMixerSinkInit(pSink, pMixer, pszName, enmDir);
         if (RT_SUCCESS(rc))
-            rc = RTCritSectInit(&pSink->CritSect);
-
-        if (RT_SUCCESS(rc))
-        {
-            pSink->pParent  = pMixer;
-            pSink->enmDir   = enmDir;
-            RTListInit(&pSink->lstStreams);
-
-            /* Set initial volume to max. */
-            pSink->Volume.fMuted = false;
-            pSink->Volume.uLeft  = PDMAUDIO_VOLUME_MAX;
-            pSink->Volume.uRight = PDMAUDIO_VOLUME_MAX;
-
-            /* Ditto for the combined volume. */
-            pSink->VolumeCombined.fMuted = false;
-            pSink->VolumeCombined.uLeft  = PDMAUDIO_VOLUME_MAX;
-            pSink->VolumeCombined.uRight = PDMAUDIO_VOLUME_MAX;
-
-            RTListAppend(&pMixer->lstSinks, &pSink->Node);
-            pMixer->cSinks++;
-
-            LogFlowFunc(("pMixer=%p, pSink=%p, cSinks=%RU8\n",
-                         pMixer, pSink, pMixer->cSinks));
-
-            if (ppSink)
-                *ppSink = pSink;
+        {
+            rc = audioMixerAddSinkInternal(pMixer, pSink);
+            if (RT_SUCCESS(rc))
+            {
+                if (ppSink)
+                    *ppSink = pSink;
+            }
         }
 
         if (RT_FAILURE(rc))
         {
-            RTCritSectDelete(&pSink->CritSect);
-
-            if (pSink)
-            {
-                RTMemFree(pSink);
-                pSink = NULL;
-            }
+            audioMixerSinkDestroyInternal(pSink);
+
+            RTMemFree(pSink);
+            pSink = NULL;
         }
     }
@@ -245 +222 @@
  * @param   ppMixer             Pointer which returns the created mixer object.
  */
-int AudioMixerCreate(const char *pszName, uint32_t fFlags, PAUDIOMIXER *ppMixer)
+int AudioMixerCreate(const char *pcszName, uint32_t fFlags, PAUDIOMIXER *ppMixer)
 {
     RT_NOREF(fFlags);
-    AssertPtrReturn(pszName, VERR_INVALID_POINTER);
+    AssertPtrReturn(pcszName, VERR_INVALID_POINTER);
     /** @todo Add fFlags validation. */
     AssertPtrReturn(ppMixer, VERR_INVALID_POINTER);
@@ -257 +234 @@
     if (pMixer)
     {
-        pMixer->pszName = RTStrDup(pszName);
+        pMixer->pszName = RTStrDup(pcszName);
         if (!pMixer->pszName)
             rc = VERR_NO_MEMORY;
@@ -343 +320 @@
 
         audioMixerRemoveSinkInternal(pMixer, pSinkToRemove);
+
         audioMixerSinkDestroyInternal(pSinkToRemove);
+
+        RTMemFree(pSinkToRemove);
     }
 
@@ -409 +389 @@
 
 /**
+ * Adds sink to an existing mixer.
+ *
+ * @returns VBox status code.
+ * @param   pMixer              Mixer to add sink to.
+ * @param   pSink               Sink to add.
+ */
+static int audioMixerAddSinkInternal(PAUDIOMIXER pMixer, PAUDMIXSINK pSink)
+{
+    AssertPtrReturn(pMixer, VERR_INVALID_POINTER);
+    AssertPtrReturn(pSink,  VERR_INVALID_POINTER);
+
+    /** @todo Check upper sink limit? */
+    /** @todo Check for double-inserted sinks? */
+
+    RTListAppend(&pMixer->lstSinks, &pSink->Node);
+    pMixer->cSinks++;
+
+    LogFlowFunc(("pMixer=%p, pSink=%p, cSinks=%RU8\n",
+                 pMixer, pSink, pMixer->cSinks));
+
+    return VINF_SUCCESS;
+}
+
+/**
  * Removes a formerly attached audio sink for an audio mixer, internal version.
  *
@@ -429 +433 @@
     /* Remove sink from mixer. */
     RTListNodeRemove(&pSink->Node);
+
     Assert(pMixer->cSinks);
+    pMixer->cSinks--;
 
     /* Set mixer to NULL so that we know we're not part of any mixer anymore. */
@@ -810 +816 @@
 
 /**
+ * Initializes a sink.
+ *
+ * @returns VBox status code.
+ * @param   pSink               Sink to initialize.
+ * @param   pMixer              Mixer the sink is assigned to.
+ * @param   pcszName            Name of the sink.
+ * @param   enmDir              Direction of the sink.
+ */
+static int audioMixerSinkInit(PAUDMIXSINK pSink, PAUDIOMIXER pMixer, const char *pcszName, AUDMIXSINKDIR enmDir)
+{
+    pSink->pszName = RTStrDup(pcszName);
+    if (!pSink->pszName)
+        return VERR_NO_MEMORY;
+
+    int rc = RTCritSectInit(&pSink->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+        pSink->pParent  = pMixer;
+        pSink->enmDir   = enmDir;
+
+        RTListInit(&pSink->lstStreams);
+
+        /* Set initial volume to max. */
+        pSink->Volume.fMuted = false;
+        pSink->Volume.uLeft  = PDMAUDIO_VOLUME_MAX;
+        pSink->Volume.uRight = PDMAUDIO_VOLUME_MAX;
+
+        /* Ditto for the combined volume. */
+        pSink->VolumeCombined.fMuted = false;
+        pSink->VolumeCombined.uLeft  = PDMAUDIO_VOLUME_MAX;
+        pSink->VolumeCombined.uRight = PDMAUDIO_VOLUME_MAX;
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+/**
  * Destroys a mixer sink and removes it from the attached mixer (if any).
  *
@@ -830 +874 @@
 
         audioMixerRemoveSinkInternal(pMixer, pSink);
-
-        Assert(pMixer->cSinks);
-        pMixer->cSinks--;
     }
 
@@ -839 +880 @@
 
     audioMixerSinkDestroyInternal(pSink);
+
+    RTMemFree(pSink);
+    pSink = NULL;
 }
 
@@ -876 +920 @@
     AudioMixBufDestroy(&pSink->MixBuf);
     RTCritSectDelete(&pSink->CritSect);
-
-    RTMemFree(pSink);
-    pSink = NULL;
 }
 
@@ -996 +1037 @@
         return AUDMIXSINKDIR_UNKNOWN;
 
-    AUDMIXSINKDIR enmDir = pSink->enmDir;
+    const AUDMIXSINKDIR enmDir = pSink->enmDir;
 
     int rc2 = RTCritSectLeave(&pSink->CritSect);
@@ -1090 +1131 @@
         return 0;
 
-    uint8_t cStreams = pSink->cStreams;
+    const uint8_t cStreams = pSink->cStreams;
 
     rc2 = RTCritSectLeave(&pSink->CritSect);
@@ -1114 +1155 @@
         return false;
 
-    bool fIsActive = pSink->fStatus & AUDMIXSINK_STS_RUNNING;
+    const bool fIsActive = pSink->fStatus & AUDMIXSINK_STS_RUNNING;
     /* Note: AUDMIXSINK_STS_PENDING_DISABLE implies AUDMIXSINK_STS_RUNNING. */
 
@@ -1509 +1550 @@
             rc = pStream->pConn->pfnEnable(pStream->pConn, PDMAUDIODIR_IN, true /* Enable */);
             if (RT_SUCCESS(rc))
+            {
                 pSink->In.pStreamRecSource = pStream;
+            }
             else if (pSink->In.pStreamRecSource->pConn) /* Stay with the current recording source (if any) and re-enable it. */
             {
@@ -2307 +2350 @@
     return fIsValid;
 }
-