Changeset 68488 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 21, 2017 2:13:51 PM (7 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: A bit of parameter grouping; no actual code changes.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (8 diffs)
• DrvAudio.h (modified) (4 diffs)

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

@@ -1952 +1952 @@
                 {
                     case PDMAUDIODEVICECBTYPE_DATA_INPUT:
-                        RTListAppend(&pThis->lstCBIn, &pCB->Node);
+                        RTListAppend(&pThis->In.lstCB, &pCB->Node);
                         break;
 
                     case PDMAUDIODEVICECBTYPE_DATA_OUTPUT:
-                        RTListAppend(&pThis->lstCBOut, &pCB->Node);
+                        RTListAppend(&pThis->Out.lstCB, &pCB->Node);
                         break;
 
@@ -2215 +2215 @@
     }
 
-    pThis->cStreamsFreeIn  = pThis->BackendCfg.cMaxStreamsIn;
-    pThis->cStreamsFreeOut = pThis->BackendCfg.cMaxStreamsOut;
-
-    LogFlowFunc(("cStreamsFreeIn=%RU8, cStreamsFreeOut=%RU8\n", pThis->cStreamsFreeIn, pThis->cStreamsFreeOut));
+    pThis->In.cStreamsFree  = pThis->BackendCfg.cMaxStreamsIn;
+    pThis->Out.cStreamsFree = pThis->BackendCfg.cMaxStreamsOut;
+
+    LogFlowFunc(("cStreamsFreeIn=%RU8, cStreamsFreeOut=%RU8\n", pThis->In.cStreamsFree, pThis->Out.cStreamsFree));
 
     LogRel2(("Audio: Host audio backend supports %RU32 input streams and %RU32 output streams at once\n",
              /* Clamp for logging. Unlimited streams are defined by UINT32_MAX. */
-             RT_MIN(64, pThis->cStreamsFreeIn), RT_MIN(64, pThis->cStreamsFreeOut)));
+             RT_MIN(64, pThis->In.cStreamsFree), RT_MIN(64, pThis->Out.cStreamsFree)));
 
 #ifdef VBOX_WITH_AUDIO_ENUM
@@ -2490 +2490 @@
         if (pCfgHost->enmDir == PDMAUDIODIR_IN)
         {
-            if (!pThis->cStreamsFreeIn)
+            if (!pThis->In.cStreamsFree)
                 LogFunc(("Warning: No more input streams free to use\n"));
 
@@ -2497 +2497 @@
         else /* Out */
         {
-            if (!pThis->cStreamsFreeOut)
+            if (!pThis->Out.cStreamsFree)
             {
                 LogFlowFunc(("Maximum number of host output streams reached\n"));
@@ -2639 +2639 @@
         if (pCfgHost->enmDir == PDMAUDIODIR_IN)
         {
-            if (pThis->cStreamsFreeIn)
-                pThis->cStreamsFreeIn--;
+            if (pThis->In.cStreamsFree)
+                pThis->In.cStreamsFree--;
         }
         else /* Out */
         {
-            if (pThis->cStreamsFreeOut)
-                pThis->cStreamsFreeOut--;
+            if (pThis->Out.cStreamsFree)
+                pThis->Out.cStreamsFree--;
         }
 
@@ -3029 +3029 @@
         if (enmDir == PDMAUDIODIR_IN)
         {
-            pThis->cStreamsFreeIn++;
+            pThis->In.cStreamsFree++;
         }
         else /* Out */
         {
-            pThis->cStreamsFreeOut++;
+            pThis->Out.cStreamsFree++;
         }
     }
@@ -3271 +3271 @@
     RTListInit(&pThis->lstGstStreams);
 #ifdef VBOX_WITH_AUDIO_CALLBACKS
-    RTListInit(&pThis->lstCBIn);
-    RTListInit(&pThis->lstCBOut);
+    RTListInit(&pThis->In.lstCB);
+    RTListInit(&pThis->Out.lstCB);
 #endif
 
@@ -3436 +3436 @@
      */
     PPDMAUDIOCBRECORD pCB, pCBNext;
-    RTListForEachSafe(&pThis->lstCBIn, pCB, pCBNext, PDMAUDIOCBRECORD, Node)
+    RTListForEachSafe(&pThis->In.lstCB, pCB, pCBNext, PDMAUDIOCBRECORD, Node)
         drvAudioCallbackDestroy(pCB);
 
-    RTListForEachSafe(&pThis->lstCBOut, pCB, pCBNext, PDMAUDIOCBRECORD, Node)
+    RTListForEachSafe(&pThis->Out.lstCB, pCB, pCBNext, PDMAUDIOCBRECORD, Node)
         drvAudioCallbackDestroy(pCB);
 #endif

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

@@ -109 +109 @@
     /** List of guest input/output audio streams. */
     RTLISTANCHOR            lstGstStreams;
-    /** Max. number of free input streams.
-     *  UINT32_MAX for unlimited streams. */
-    uint32_t                cStreamsFreeIn;
-    /** Max. number of free output streams.
-     *  UINT32_MAX for unlimited streams. */
-    uint32_t                cStreamsFreeOut;
 #ifdef VBOX_WITH_AUDIO_ENUM
     /** Flag indicating to perform an (re-)enumeration of the host audio devices. */
@@ -121 +115 @@
     /** Audio configuration settings retrieved from the backend. */
     PDMAUDIOBACKENDCFG      BackendCfg;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-    /** @todo Use a map with primary key set to the callback type? */
-    RTLISTANCHOR            lstCBIn;
-    RTLISTANCHOR            lstCBOut;
-#endif
 #ifdef VBOX_WITH_STATISTICS
     /** Statistics for the statistics manager (STAM). */
@@ -135 +124 @@
          *  This flag overrides all the attached stream statuses. */
         bool                fEnabled;
+        /** Max. number of free input streams.
+         *  UINT32_MAX for unlimited streams. */
+        uint32_t            cStreamsFree;
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+        RTLISTANCHOR        lstCB;
+#endif
     } In;
     struct
@@ -141 +136 @@
          *  This flag overrides all the attached stream statuses. */
         bool                fEnabled;
+        /** Max. number of free output streams.
+         *  UINT32_MAX for unlimited streams. */
+    uint32_t                cStreamsFree;
+#ifdef VBOX_WITH_AUDIO_CALLBACKS
+        RTLISTANCHOR        lstCB;
+#endif
     } Out;
 } DRVAUDIO, *PDRVAUDIO;