Changeset 88907 in vbox

Timestamp:

May 6, 2021 3:23:35 PM (4 years ago)

Author:

vboxsync

Message:

AudioMixer: Removed a few unused function. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (10 diffs)
• AudioMixer.h (modified) (4 diffs)

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

@@ -358 +358 @@
 }
 
+#if 0 /* unused */
 /**
  * Invalidates all internal data.
@@ -379 +380 @@
     AssertRC(rc2);
 }
+#endif
 
 /**
@@ -436 +438 @@
 
 /**
- * Removes a formerly attached audio sink for an audio mixer.
- *
- * @returns VBox status code.
- * @param   pMixer              Mixer to remove sink from.
- * @param   pSink               Sink to remove.
- */
-void AudioMixerRemoveSink(PAUDIOMIXER pMixer, PAUDMIXSINK pSink)
-{
-    int rc2 = RTCritSectEnter(&pMixer->CritSect);
-    AssertRC(rc2);
-
-    audioMixerSinkRemoveAllStreamsInternal(pSink);
-    audioMixerRemoveSinkInternal(pMixer, pSink);
-
-    rc2 = RTCritSectLeave(&pMixer->CritSect);
-}
-
-/**
  * Sets the mixer's master volume.
  *
@@ -483 +467 @@
 }
 
+
 /*********************************************************************************************************************************
- * Mixer Sink implementation.
- ********************************************************************************************************************************/
+*   Mixer Sink implementation.                                                                                                   *
+*********************************************************************************************************************************/
 
 /**
@@ -496 +481 @@
 int AudioMixerSinkAddStream(PAUDMIXSINK pSink, PAUDMIXSTREAM pStream)
 {
+    LogFlowFuncEnter();
     AssertPtrReturn(pSink,   VERR_INVALID_POINTER);
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
     int rc = RTCritSectEnter(&pSink->CritSect);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    if (pSink->cStreams == UINT8_MAX) /* 255 streams per sink max. */
-    {
-        int rc2 = RTCritSectLeave(&pSink->CritSect);
-        AssertRC(rc2);
-
-        return VERR_NO_MORE_HANDLES;
-    }
-
-    LogFlowFuncEnter();
+    AssertRCReturn(rc, rc);
+    AssertLogRelMsgReturnStmt(pSink->cStreams < UINT8_MAX, ("too many streams!\n"), RTCritSectLeave(&pSink->CritSect),
+                              VERR_TOO_MANY_OPEN_FILES);
+
 
     /** @todo Check if stream already is assigned to (another) sink. */
@@ -581 +559 @@
     PDMAUDIOBACKENDCFG BackendCfg;
     int rc = pConn->pfnGetConfig(pConn, &BackendCfg);
-    if (RT_FAILURE(rc))
-        return rc;
+    AssertRCReturn(rc, rc);
 
     /*
@@ -1060 +1037 @@
 
 /**
- * Returns the sink's (friendly) name.
- *
- * @returns The sink's (friendly) name.
- */
-const char *AudioMixerSinkGetName(const PAUDMIXSINK pSink)
-{
-    AssertPtrReturn(pSink, "<Unknown>");
-
-    return pSink->pszName;
-}
-
-/**
- * Returns a specific mixer stream from a sink, based on its index.
- *
- * @returns Mixer stream if found, or NULL if not found.
- * @param   pSink               Sink to retrieve mixer stream from.
- * @param   uIndex              Index of the mixer stream to return.
- */
-PAUDMIXSTREAM AudioMixerSinkGetStream(PAUDMIXSINK pSink, uint8_t uIndex)
-{
-    AssertPtrReturn(pSink, NULL);
-
-    int rc = RTCritSectEnter(&pSink->CritSect);
-    if (RT_FAILURE(rc))
-        return NULL;
-
-    AssertMsgReturn(uIndex < pSink->cStreams,
-                    ("Index %RU8 exceeds stream count (%RU8)", uIndex, pSink->cStreams), NULL);
-
-    /* Slow lookup, d'oh. */
-    PAUDMIXSTREAM pStream = RTListGetFirst(&pSink->lstStreams, AUDMIXSTREAM, Node);
-    while (uIndex)
-    {
-        pStream = RTListGetNext(&pSink->lstStreams, pStream, AUDMIXSTREAM, Node);
-        uIndex--;
-    }
-
-    /** @todo Do we need to raise the stream's reference count here? */
-
-    int rc2 = RTCritSectLeave(&pSink->CritSect);
-    AssertRC(rc2);
-
-    AssertPtr(pStream);
-    return pStream;
-}
-
-/**
  * Returns the current status of a mixer sink.
  *
@@ -1131 +1061 @@
 
 /**
- * Returns the number of attached mixer streams to a mixer sink.
- *
- * @returns The number of attached mixer streams.
- * @param   pSink               Mixer sink to return number for.
- */
-uint8_t AudioMixerSinkGetStreamCount(PAUDMIXSINK pSink)
-{
-    if (!pSink)
-        return 0;
-
-    int rc2 = RTCritSectEnter(&pSink->CritSect);
-    if (RT_FAILURE(rc2))
-        return 0;
-
-    const uint8_t cStreams = pSink->cStreams;
-
-    rc2 = RTCritSectLeave(&pSink->CritSect);
-    AssertRC(rc2);
-
-    return cStreams;
-}
-
-/**
  * Returns whether the sink is in an active state or not.
- * Note: The pending disable state also counts as active.
+ *
+ * @note The pending disable state also counts as active.
  *
  * @returns True if active, false if not.
@@ -1425 +1333 @@
 
     audioMixerSinkReset(pSink);
-
-    rc2 = RTCritSectLeave(&pSink->CritSect);
-    AssertRC(rc2);
-}
-
-/**
- * Returns the audio format of a mixer sink.
- *
- * @param   pSink               Sink to retrieve audio format for.
- * @param   pPCMProps           Where to the returned audio format.
- */
-void AudioMixerSinkGetFormat(PAUDMIXSINK pSink, PPDMAUDIOPCMPROPS pPCMProps)
-{
-    AssertPtrReturnVoid(pSink);
-    AssertPtrReturnVoid(pPCMProps);
-
-    int rc2 = RTCritSectEnter(&pSink->CritSect);
-    if (RT_FAILURE(rc2))
-        return;
-
-    memcpy(pPCMProps, &pSink->PCMProps, sizeof(PDMAUDIOPCMPROPS));
 
     rc2 = RTCritSectLeave(&pSink->CritSect);
@@ -2175 +2062 @@
 
 /**
- * Controls a mixer stream.
- *
- * @returns VBox 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)
-{
-    RT_NOREF(fCtl);
-    AssertPtrReturn(pMixStream, VERR_INVALID_POINTER);
-    /** @todo Validate fCtl. */
-
-    int rc = RTCritSectEnter(&pMixStream->CritSect);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    rc = audioMixerStreamCtlInternal(pMixStream, enmCmd, fCtl);
-
-    int rc2 = RTCritSectLeave(&pMixStream->CritSect);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    return rc;
-}
-
-/**
  * Destroys a mixer stream, internal version.
  *

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

@@ -270 +270 @@
 void AudioMixerDestroy(PAUDIOMIXER pMixer, PPDMDEVINS pDevIns);
 void AudioMixerInvalidate(PAUDIOMIXER pMixer);
-void AudioMixerRemoveSink(PAUDIOMIXER pMixer, PAUDMIXSINK pSink);
 int AudioMixerSetMasterVolume(PAUDIOMIXER pMixer, PPDMAUDIOVOLUME pVol);
 void AudioMixerDebug(PAUDIOMIXER pMixer, PCDBGFINFOHLP pHlp, const char *pszArgs);
@@ -282 +281 @@
 uint32_t AudioMixerSinkGetWritable(PAUDMIXSINK pSink);
 AUDMIXSINKDIR AudioMixerSinkGetDir(PAUDMIXSINK pSink);
-const char *AudioMixerSinkGetName(const PAUDMIXSINK pSink);
 PAUDMIXSTREAM AudioMixerSinkGetRecordingSource(PAUDMIXSINK pSink);
-PAUDMIXSTREAM AudioMixerSinkGetStream(PAUDMIXSINK pSink, uint8_t uIndex);
 AUDMIXSINKSTS AudioMixerSinkGetStatus(PAUDMIXSINK pSink);
-uint8_t AudioMixerSinkGetStreamCount(PAUDMIXSINK pSink);
 bool AudioMixerSinkIsActive(PAUDMIXSINK pSink);
 int AudioMixerSinkRead(PAUDMIXSINK pSink, AUDMIXOP enmOp, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead);
@@ -292 +288 @@
 void AudioMixerSinkRemoveAllStreams(PAUDMIXSINK pSink);
 void AudioMixerSinkReset(PAUDMIXSINK pSink);
-void AudioMixerSinkGetFormat(PAUDMIXSINK pSink, PPDMAUDIOPCMPROPS pPCMProps);
 int AudioMixerSinkSetFormat(PAUDMIXSINK pSink, PCPDMAUDIOPCMPROPS pPCMProps);
 int AudioMixerSinkSetRecordingSource(PAUDMIXSINK pSink, PAUDMIXSTREAM pStream);
@@ -299 +294 @@
 int AudioMixerSinkUpdate(PAUDMIXSINK pSink);
 
-int AudioMixerStreamCtl(PAUDMIXSTREAM pStream, PDMAUDIOSTREAMCMD enmCmd, uint32_t fCtl);
 void AudioMixerStreamDestroy(PAUDMIXSTREAM pStream, PPDMDEVINS pDevIns);