Changeset 89218 in vbox for trunk/src/VBox/Devices/Audio/DevSB16.cpp

Timestamp:

May 21, 2021 11:57:55 AM (4 years ago)

Author:

vboxsync

Message:

Audio: Converted PDMAUDIODSTSRCUNION, PDMAUDIORECSRC and PDMAUDIOPLAYBACKDST into a single enum type PDMAUDIOPATH. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DevSB16.cpp (modified) (9 diffs)

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

@@ -1747 +1747 @@
  * @param   pDrv                Driver to retrieve driver stream for.
  * @param   enmDir              Stream direction to retrieve.
- * @param   dstSrc              Stream destination / source to retrieve.
- */
-static PSB16DRIVERSTREAM sb16GetDrvStream(PSB16DRIVER pDrv, PDMAUDIODIR enmDir, PDMAUDIODSTSRCUNION dstSrc)
+ * @param   enmPath             Stream destination / source to retrieve.
+ */
+static PSB16DRIVERSTREAM sb16GetDrvStream(PSB16DRIVER pDrv, PDMAUDIODIR enmDir, PDMAUDIOPATH enmPath)
 {
     PSB16DRIVERSTREAM pDrvStream = NULL;
 
-    if (enmDir == PDMAUDIODIR_IN)
-        return NULL; /** @todo Recording not implemented yet. */
-
     if (enmDir == PDMAUDIODIR_OUT)
     {
-        LogFunc(("enmDst=%RU32\n", dstSrc.enmDst));
-
-        switch (dstSrc.enmDst)
+        LogFunc(("enmPath=%d\n", enmPath));
+
+        switch (enmPath)
         {
-            case PDMAUDIOPLAYBACKDST_FRONT:
+            case PDMAUDIOPATH_OUT_FRONT:
                 pDrvStream = &pDrv->Out;
                 break;
@@ -1771 +1768 @@
     }
     else
-        AssertFailed();
+        Assert(enmDir == PDMAUDIODIR_IN /** @todo Recording not implemented yet. */);
 
     return pDrvStream;
@@ -1800 +1797 @@
     int rc;
 
-    PSB16DRIVERSTREAM pDrvStream = sb16GetDrvStream(pDrv, pStreamCfg->enmDir, pStreamCfg->u);
+    PSB16DRIVERSTREAM pDrvStream = sb16GetDrvStream(pDrv, pStreamCfg->enmDir, pStreamCfg->enmPath);
     if (pDrvStream)
     {
@@ -1868 +1865 @@
  * @param   pMixSink    Mixer sink to remove audio streams from.
  * @param   enmDir      Stream direction to remove.
- * @param   dstSrc      Stream destination / source to remove.
+ * @param   enmPath     Stream destination / source to remove.
  * @param   pDrv        Driver stream to remove.
  */
 static void sb16RemoveDrvStream(PPDMDEVINS pDevIns, PAUDMIXSINK pMixSink, PDMAUDIODIR enmDir,
-                                PDMAUDIODSTSRCUNION dstSrc, PSB16DRIVER pDrv)
-{
-    PSB16DRIVERSTREAM pDrvStream = sb16GetDrvStream(pDrv, enmDir, dstSrc);
+                                PDMAUDIOPATH enmPath, PSB16DRIVER pDrv)
+{
+    PSB16DRIVERSTREAM pDrvStream = sb16GetDrvStream(pDrv, enmDir, enmPath);
     if (pDrvStream)
     {
@@ -1896 +1893 @@
  * @param   pMixSink    Mixer sink to remove audio streams from.
  * @param   enmDir      Stream direction to remove.
- * @param   dstSrc      Stream destination / source to remove.
+ * @param   enmPath     Stream destination / source to remove.
  */
 static void sb16RemoveDrvStreams(PPDMDEVINS pDevIns, PSB16STATE pThis, PAUDMIXSINK pMixSink,
-                                 PDMAUDIODIR enmDir, PDMAUDIODSTSRCUNION dstSrc)
+                                 PDMAUDIODIR enmDir, PDMAUDIOPATH enmPath)
 {
     AssertPtrReturnVoid(pMixSink);
@@ -1906 +1903 @@
     RTListForEach(&pThis->lstDrv, pDrv, SB16DRIVER, Node)
     {
-        sb16RemoveDrvStream(pDevIns, pMixSink, enmDir, dstSrc, pDrv);
+        sb16RemoveDrvStream(pDevIns, pMixSink, enmDir, enmPath, pDrv);
     }
 }
@@ -2209 +2206 @@
         {
             pStream->Cfg.enmDir    = PDMAUDIODIR_OUT;
-            pStream->Cfg.u.enmDst  = PDMAUDIOPLAYBACKDST_FRONT;
+            pStream->Cfg.enmPath   = PDMAUDIOPATH_OUT_FRONT;
             pStream->Cfg.enmLayout = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
 
@@ -2252 +2249 @@
     AssertReturn(PDMAudioPropsAreValid(&pStream->Cfg.Props), VERR_INVALID_PARAMETER);
 
-    PDMAUDIODSTSRCUNION dstSrc;
-    PDMAUDIODIR         enmDir;
-
     switch (pStream->uIdx)
     {
         case SB16_IDX_OUT:
-        {
             pStream->Cfg.enmDir      = PDMAUDIODIR_OUT;
-            pStream->Cfg.u.enmDst    = PDMAUDIOPLAYBACKDST_FRONT;
+            pStream->Cfg.enmPath     = PDMAUDIOPATH_OUT_FRONT;
             pStream->Cfg.enmLayout   = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
 
             RTStrCopy(pStream->Cfg.szName, sizeof(pStream->Cfg.szName), "Output");
-
-            dstSrc.enmDst = PDMAUDIOPLAYBACKDST_FRONT;
-            enmDir        = PDMAUDIODIR_OUT;
-            break;
-        }
+            break;
 
         default:
@@ -2301 +2290 @@
 
     sb16RemoveDrvStreams(pDevIns, pThis,
-                         sb16StreamIndexToSink(pThis, pStream->uIdx), pStream->Cfg.enmDir, pStream->Cfg.u);
+                         sb16StreamIndexToSink(pThis, pStream->uIdx), pStream->Cfg.enmDir, pStream->Cfg.enmPath);
 
     rc = sb16AddDrvStreams(pDevIns, pThis, pMixerSink, &pStream->Cfg);