Changeset 88053 in vbox

Timestamp:

Mar 9, 2021 2:15:43 PM (4 years ago)

Author:

vboxsync

Message:

Audio: Moved the host audio device enumeration code to PDM (VBox/vmm/pdmaudiohostenuminline.h). bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (1 diff)
• DrvHostCoreAudio.cpp (modified) (5 diffs)
• DrvHostDSound.cpp (modified) (4 diffs)

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

@@ -2180 +2180 @@
                     LogRel(("Audio: Device '%s':\n", pDev->szName));
                     LogRel(("Audio:   Usage           = %s\n",   PDMAudioDirGetName(pDev->enmUsage)));
-                    LogRel(("Audio:   Flags           = %s\n",   PDMAudioDeviceFlagsToString(szFlags, pDev->fFlags)));
+                    LogRel(("Audio:   Flags           = %s\n",   PDMAudioHostDevFlagsToString(szFlags, pDev->fFlags)));
                     LogRel(("Audio:   Input channels  = %RU8\n", pDev->cMaxInputChannels));
                     LogRel(("Audio:   Output channels = %RU8\n", pDev->cMaxOutputChannels));

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

@@ -542 +542 @@
         {
             if (pDev) /* Some (skipped) device to clean up first? */
-                PDMAudioDeviceFree(&pDev->Core);
-
-            pDev = (PCOREAUDIODEVICEDATA)PDMAudioDeviceAlloc(sizeof(*pDev));
+                PDMAudioHostDevFree(&pDev->Core);
+
+            pDev = (PCOREAUDIODEVICEDATA)PDMAudioHostDevAlloc(sizeof(*pDev));
             if (!pDev)
             {
@@ -670 +670 @@
         if (RT_FAILURE(rc))
         {
-            PDMAudioDeviceFree(&pDev->Core);
+            PDMAudioHostDevFree(&pDev->Core);
             pDev = NULL;
         }
@@ -743 +743 @@
             RTListForEach(&devEnmIn.LstDevices, pDevSrcIn, COREAUDIODEVICEDATA, Core.Node)
             {
-                PCOREAUDIODEVICEDATA pDevDst = (PCOREAUDIODEVICEDATA)PDMAudioDeviceAlloc(sizeof(*pDevDst));
+                PCOREAUDIODEVICEDATA pDevDst = (PCOREAUDIODEVICEDATA)PDMAudioHostDevAlloc(sizeof(*pDevDst));
                 if (!pDevDst)
                 {
@@ -786 +786 @@
                 else
                 {
-                    PDMAudioDeviceFree(&pDevDst->Core);
+                    PDMAudioHostDevFree(&pDevDst->Core);
                     pDevDst = NULL;
                 }
@@ -803 +803 @@
                         continue; /* Already in our list, skip. */
 
-                    PCOREAUDIODEVICEDATA pDevDst = (PCOREAUDIODEVICEDATA)PDMAudioDeviceAlloc(sizeof(*pDevDst));
+                    PCOREAUDIODEVICEDATA pDevDst = (PCOREAUDIODEVICEDATA)PDMAudioHostDevAlloc(sizeof(*pDevDst));
                     if (!pDevDst)
                     {

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

@@ -1586 +1586 @@
 
     int rc;
-    PDSOUNDDEV pDev = (PDSOUNDDEV)PDMAudioDeviceAlloc(sizeof(DSOUNDDEV));
+    PDSOUNDDEV pDev = (PDSOUNDDEV)PDMAudioHostDevAlloc(sizeof(DSOUNDDEV));
     if (pDev)
     {
@@ -1612 +1612 @@
             return TRUE;
         }
-        PDMAudioDeviceFree(&pDev->Core);
+        PDMAudioHostDevFree(&pDev->Core);
     }
     else
@@ -1645 +1645 @@
 
     int rc;
-    PDSOUNDDEV pDev = (PDSOUNDDEV)PDMAudioDeviceAlloc(sizeof(DSOUNDDEV));
+    PDSOUNDDEV pDev = (PDSOUNDDEV)PDMAudioHostDevAlloc(sizeof(DSOUNDDEV));
     if (pDev)
     {
@@ -1668 +1668 @@
             return TRUE;
         }
-        PDMAudioDeviceFree(&pDev->Core);
+        PDMAudioHostDevFree(&pDev->Core);
     }
     else