Changeset 88717 in vbox for trunk/src

Timestamp:

Apr 26, 2021 8:50:18 PM (4 years ago)

Author:

vboxsync

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

144035

Message:

DrvAudio: Some more tidying up. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (6 diffs)

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

@@ -331 +331 @@
 static int drvAudioDevicesEnumerateInternal(PDRVAUDIO pThis, bool fLog, PPDMAUDIOHOSTENUM pDevEnum);
 #endif
-
 static int drvAudioStreamControlInternalBackend(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx, PDMAUDIOSTREAMCMD enmStreamCmd);
 static int drvAudioStreamControlInternal(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx, PDMAUDIOSTREAMCMD enmStreamCmd);
 static int drvAudioStreamCreateInternalBackend(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq);
 static int drvAudioStreamDestroyInternalBackend(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx);
-static void drvAudioStreamFree(PDRVAUDIOSTREAM pStream);
 static int drvAudioStreamUninitInternal(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx);
 static int drvAudioStreamIterateInternal(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx);
-static void drvAudioStreamDropInternal(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx);
-static void drvAudioStreamResetInternal(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx);
 
 
@@ -421 +417 @@
 }
 
+
+/**
+ * Drops all audio data (and associated state) of a stream.
+ *
+ * @param   pThis       Pointer to driver instance.
+ * @param   pStreamEx   Stream to drop data for.
+ */
+static void drvAudioStreamDropInternal(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx)
+{
+    RT_NOREF(pThis);
+
+    LogFunc(("[%s]\n", pStreamEx->Core.szName));
+
+    if (pStreamEx->fNoMixBufs)
+    {
+        AudioMixBufReset(&pStreamEx->Guest.MixBuf);
+        AudioMixBufReset(&pStreamEx->Host.MixBuf);
+    }
+
+    pStreamEx->fThresholdReached    = false;
+    pStreamEx->nsLastIterated       = 0;
+    pStreamEx->nsLastPlayedCaptured = 0;
+    pStreamEx->nsLastReadWritten    = 0;
+}
+
+
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
 /**
@@ -436 +458 @@
     RTListForEach(&pThis->lstStreams, pStreamEx, DRVAUDIOSTREAM, ListEntry)
     {
-        pStreamEx->Core.fStatus        |= PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT;
-        pStreamEx->cTriesReInit    = 0;
-        pStreamEx->nsLastReInit         = 0;
+        pStreamEx->Core.fStatus |= PDMAUDIOSTREAMSTS_FLAGS_PENDING_REINIT;
+        pStreamEx->cTriesReInit  = 0;
+        pStreamEx->nsLastReInit  = 0;
     }
 
@@ -447 +469 @@
 }
 #endif /* VBOX_WITH_AUDIO_CALLBACKS */
+
 
 /**
@@ -511 +534 @@
 }
 
-/**
- * Drops all audio data (and associated state) of a stream.
- *
- * @param   pThis       Pointer to driver instance.
- * @param   pStreamEx   Stream to drop data for.
- */
-static void drvAudioStreamDropInternal(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx)
-{
-    RT_NOREF(pThis);
-
-    LogFunc(("[%s]\n", pStreamEx->Core.szName));
-
-    if (pStreamEx->fNoMixBufs)
-    {
-        AudioMixBufReset(&pStreamEx->Guest.MixBuf);
-        AudioMixBufReset(&pStreamEx->Host.MixBuf);
-    }
-
-    pStreamEx->fThresholdReached    = false;
-    pStreamEx->nsLastIterated       = 0;
-    pStreamEx->nsLastPlayedCaptured = 0;
-    pStreamEx->nsLastReadWritten    = 0;
-}
 
 /**
@@ -2502 +2502 @@
  * @param   pThis       Pointer to driver instance.
  * @param   pStreamEx   Stream to iterate.
- *
- * @todo    r=bird: Don't know why the default behavior isn't to push data into
- *          the backend...  We'll never get out of the pending-disable state if
- *          the mixing buffer doesn't empty out.
  */
 static int drvAudioStreamIterateInternal(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx)