Changeset 88055 in vbox

Timestamp:

Mar 9, 2021 2:39:16 PM (4 years ago)

Author:

vboxsync

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

143186

Message:

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

Location:

trunk

Files:

• include/VBox/vmm/pdmaudiohostenuminline.h (modified) (10 diffs)
• include/VBox/vmm/pdmaudioifs.h (modified) (1 diff)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (modified) (4 diffs)
• src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmaudiohostenuminline.h

@@ -73 +73 @@
         pDev->uMagic = PDMAUDIOHOSTDEV_MAGIC;
         pDev->cbSelf = (uint32_t)cb;
-        RTListInit(&pDev->Node);
+        RTListInit(&pDev->ListEntry);
 
         //pDev->cMaxInputChannels  = 0;
@@ -119 +119 @@
     {
         memcpy(pDevDup, pDev, cbToDup);
-        RTListInit(&pDevDup->Node);
+        RTListInit(&pDevDup->ListEntry);
         pDev->cbSelf = cbToDup;
     }
@@ -156 +156 @@
 
         PPDMAUDIOHOSTDEV pDev, pDevNext;
-        RTListForEachSafe(&pDevEnm->LstDevices, pDev, pDevNext, PDMAUDIOHOSTDEV, Node)
-        {
-            RTListNodeRemove(&pDev->Node);
+        RTListForEachSafe(&pDevEnm->LstDevices, pDev, pDevNext, PDMAUDIOHOSTDEV, ListEntry)
+        {
+            RTListNodeRemove(&pDev->ListEntry);
 
             PDMAudioHostDevFree(pDev);
@@ -185 +185 @@
     Assert(pDevEnm->uMagic == PDMAUDIOHOSTENUM_MAGIC);
 
-    RTListAppend(&pDevEnm->LstDevices, &pDev->Node);
+    RTListAppend(&pDevEnm->LstDevices, &pDev->ListEntry);
     pDevEnm->cDevices++;
 }
@@ -211 +211 @@
 
     PPDMAUDIOHOSTDEV pSrcDev;
-    RTListForEach(&pSrcDevEnm->LstDevices, pSrcDev, PDMAUDIOHOSTDEV, Node)
+    RTListForEach(&pSrcDevEnm->LstDevices, pSrcDev, PDMAUDIOHOSTDEV, ListEntry)
     {
         if (   enmUsage == pSrcDev->enmUsage
@@ -244 +244 @@
 
     PPDMAUDIOHOSTDEV pDev;
-    RTListForEach(&pDevEnm->LstDevices, pDev, PDMAUDIOHOSTDEV, Node)
+    RTListForEach(&pDevEnm->LstDevices, pDev, PDMAUDIOHOSTDEV, ListEntry)
     {
         if (pDev->fFlags & PDMAUDIOHOSTDEV_F_DEFAULT)
@@ -275 +275 @@
     uint32_t        cDevs = 0;
     PPDMAUDIOHOSTDEV pDev;
-    RTListForEach(&pDevEnm->LstDevices, pDev, PDMAUDIOHOSTDEV, Node)
+    RTListForEach(&pDevEnm->LstDevices, pDev, PDMAUDIOHOSTDEV, ListEntry)
     {
         if (enmUsage == pDev->enmUsage)
@@ -335 +335 @@
 DECLINLINE(void) PDMAudioHostEnumLog(PCPDMAUDIOHOSTENUM pDevEnm, const char *pszDesc)
 {
+#ifdef LOG_ENABLED
     AssertPtrReturnVoid(pDevEnm);
     AssertPtrReturnVoid(pszDesc);
@@ -344 +345 @@
 
         PPDMAUDIOHOSTDEV pDev;
-        RTListForEach(&pDevEnm->LstDevices, pDev, PDMAUDIOHOSTDEV, Node)
+        RTListForEach(&pDevEnm->LstDevices, pDev, PDMAUDIOHOSTDEV, ListEntry)
         {
             char szFlags[PDMAUDIOHOSTDEV_MAX_FLAGS_STRING_LEN];
@@ -355 +356 @@
         }
     }
+#else
+    RT_NOREF(pDevEnm, pszDesc);
+#endif
 }
 

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -360 +360 @@
 {
     /** List entry (like PDMAUDIOHOSTENUM::LstDevices). */
-    RTLISTNODE          Node;
+    RTLISTNODE          ListEntry;
     /** Magic value (PDMAUDIOHOSTDEV_MAGIC). */
     uint32_t            uMagic;

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

@@ -2173 +2173 @@
 
             PPDMAUDIOHOSTDEV pDev;
-            RTListForEach(&DevEnum.LstDevices, pDev, PDMAUDIOHOSTDEV, Node)
+            RTListForEach(&DevEnum.LstDevices, pDev, PDMAUDIOHOSTDEV, ListEntry)
             {
                 if (fLog)

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

@@ -704 +704 @@
 {
     PCOREAUDIODEVICEDATA pDevSrc;
-    RTListForEach(&pEnmSrc->LstDevices, pDevSrc, COREAUDIODEVICEDATA, Core.Node)
+    RTListForEach(&pEnmSrc->LstDevices, pDevSrc, COREAUDIODEVICEDATA, Core.ListEntry)
     {
         if (pDevSrc->deviceID == deviceID)
@@ -741 +741 @@
             PDMAudioHostEnumInit(pEnmDst);
             PCOREAUDIODEVICEDATA pDevSrcIn;
-            RTListForEach(&devEnmIn.LstDevices, pDevSrcIn, COREAUDIODEVICEDATA, Core.Node)
+            RTListForEach(&devEnmIn.LstDevices, pDevSrcIn, COREAUDIODEVICEDATA, Core.ListEntry)
             {
                 PCOREAUDIODEVICEDATA pDevDst = (PCOREAUDIODEVICEDATA)PDMAudioHostDevAlloc(sizeof(*pDevDst));
@@ -769 +769 @@
                  */
                 PCOREAUDIODEVICEDATA pDevSrcOut;
-                RTListForEach(&devEnmOut.LstDevices, pDevSrcOut, COREAUDIODEVICEDATA, Core.Node)
+                RTListForEach(&devEnmOut.LstDevices, pDevSrcOut, COREAUDIODEVICEDATA, Core.ListEntry)
                 {
                     if (pDevSrcIn->deviceID == pDevSrcOut->deviceID)
@@ -798 +798 @@
                  */
                 PCOREAUDIODEVICEDATA pDevSrcOut;
-                RTListForEach(&devEnmOut.LstDevices, pDevSrcOut, COREAUDIODEVICEDATA, Core.Node)
+                RTListForEach(&devEnmOut.LstDevices, pDevSrcOut, COREAUDIODEVICEDATA, Core.ListEntry)
                 {
                     if (coreAudioDevicesHasDevice(pEnmDst, pDevSrcOut->deviceID))

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

@@ -1835 +1835 @@
          */
         PDSOUNDDEV pDev;
-        RTListForEach(&pDevEnm->LstDevices, pDev, DSOUNDDEV, Core.Node)
+        RTListForEach(&pDevEnm->LstDevices, pDev, DSOUNDDEV, Core.ListEntry)
         {
             dsoundDeviceQueryInfo(pThis, pDev); /* ignore rc */