Changeset 88216 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 20, 2021 1:50:05 AM (4 years ago)

Author:

vboxsync

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

143381

Message:

DrvAudio,ConsoleImpl2: Constructor cleanup, moved the input/output config and added range checks to it. bugref:9890

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -3599 +3599 @@
     HRESULT hrc;
 
-    Utf8Str strTmp;
-    GetExtraDataBoth(pVirtualBox, pMachine, "VBoxInternal2/Audio/Debug/Enabled", &strTmp);
-    const uint64_t fDebugEnabled = strTmp.equalsIgnoreCase("true") || strTmp.equalsIgnoreCase("1");
-
     BOOL fAudioEnabledIn = FALSE;
     hrc = pAudioAdapter->COMGETTER(EnabledIn)(&fAudioEnabledIn);                            H();
@@ -3616 +3612 @@
     InsertConfigInteger(pCfg, "OutputEnabled", fAudioEnabledOut);
 
+    Utf8Str strTmp;
+    GetExtraDataBoth(pVirtualBox, pMachine, "VBoxInternal2/Audio/Debug/Enabled", &strTmp);
+    const uint64_t fDebugEnabled = strTmp.equalsIgnoreCase("true") || strTmp.equalsIgnoreCase("1");
     if (fDebugEnabled)
     {
@@ -3630 +3629 @@
      * And global ones for all host drivers: VBoxInternal2/Audio/<Value>
      */
-    static const struct
+    for (unsigned iDir = 0; iDir < 2; iDir++)
     {
-        const char *pszExtraName;
-        const char *pszCfgmName;
-        uint32_t    uDefault;
-    } s_aToCopy[]
-    {
-#define AUDIO_DRV_TO_COPY_ENTRIES(a_szDir) \
-            /* PCM  parameters: */ \
-            { "PCMSampleBit"        a_szDir, "PCMSampleBit"        a_szDir, 0          }, \
-            { "PCMSampleHz"         a_szDir, "PCMSampleHz"         a_szDir, 0          }, \
-            { "PCMSampleSigned"     a_szDir, "PCMSampleSigned"     a_szDir, UINT8_MAX  }, \
-            { "PCMSampleSwapEndian" a_szDir, "PCMSampleSwapEndian" a_szDir, UINT8_MAX  }, \
-            { "PCMSampleChannels"   a_szDir, "PCMSampleChannels"   a_szDir, 0          }, \
-            /* Buffering stuff: */ \
-            { "PeriodSizeMs"        a_szDir, "PeriodSizeMs"        a_szDir, 0          }, \
-            { "BufferSizeMs"        a_szDir, "BufferSizeMs"        a_szDir, 0          }, \
-            { "PreBufferSizeMs"     a_szDir, "PreBufferSizeMs"     a_szDir, UINT32_MAX }
-        AUDIO_DRV_TO_COPY_ENTRIES("In"),
-        AUDIO_DRV_TO_COPY_ENTRIES("Out")
-#undef AUDIO_DRV_TO_COPY_ENTRIES
-    };
-    for (size_t i = 0; i < RT_ELEMENTS(s_aToCopy); i++)
-    {
-        char szExtra[128];
-        RTStrPrintf(szExtra, sizeof(szExtra), "VBoxInternal2/Audio/%s/%s", pszDrvName, s_aToCopy[i].pszExtraName);
-        GetExtraDataBoth(pVirtualBox, pMachine, szExtra, &strTmp); /* throws hrc */
-        if (strTmp.isEmpty())
-        {
-            RTStrPrintf(szExtra, sizeof(szExtra), "VBoxInternal2/Audio/%s", s_aToCopy[i].pszExtraName);
-            GetExtraDataBoth(pVirtualBox, pMachine, szExtra, &strTmp);
+        static const struct
+        {
+            const char *pszExtraName;
+            const char *pszCfgmName;
+        } s_aToCopy[] =
+        {   /* PCM  parameters: */
+            { "PCMSampleBit",        "PCMSampleBit"        },
+            { "PCMSampleHz",         "PCMSampleHz"         },
+            { "PCMSampleSigned",     "PCMSampleSigned"     },
+            { "PCMSampleSwapEndian", "PCMSampleSwapEndian" },
+            { "PCMSampleChannels",   "PCMSampleChannels"   },
+            /* Buffering stuff: */
+            { "PeriodSizeMs",        "PeriodSizeMs"        },
+            { "BufferSizeMs",        "BufferSizeMs"        },
+            { "PreBufferSizeMs",     "PreBufferSizeMs"     },
+        };
+
+        PCFGMNODE   pDirNode = NULL;
+        const char *pszDir   = iDir == 0 ? "In" : "Out";
+        for (size_t i = 0; i < RT_ELEMENTS(s_aToCopy); i++)
+        {
+            char szExtra[128];
+            RTStrPrintf(szExtra, sizeof(szExtra), "VBoxInternal2/Audio/%s/%s%s", pszDrvName, s_aToCopy[i].pszExtraName, pszDir);
+            GetExtraDataBoth(pVirtualBox, pMachine, szExtra, &strTmp); /* throws hrc */
             if (strTmp.isEmpty())
-                continue;
-        }
-
-        uint32_t uValue;
-        int vrc = RTStrToUInt32Full(strTmp.c_str(), 0, &uValue);
-        if (RT_SUCCESS(vrc))
-            InsertConfigInteger(pCfg, s_aToCopy[i].pszCfgmName, uValue);
-        else
-            LogRel(("Ignoring malformed 32-bit unsigned integer config value '%s' = '%s': %Rrc\n", szExtra, strTmp.c_str(), vrc));
+            {
+                RTStrPrintf(szExtra, sizeof(szExtra), "VBoxInternal2/Audio/%s%s", s_aToCopy[i].pszExtraName, pszDir);
+                GetExtraDataBoth(pVirtualBox, pMachine, szExtra, &strTmp);
+                if (strTmp.isEmpty())
+                    continue;
+            }
+
+            uint32_t uValue;
+            int vrc = RTStrToUInt32Full(strTmp.c_str(), 0, &uValue);
+            if (RT_SUCCESS(vrc))
+            {
+                if (!pDirNode)
+                    InsertConfigNode(pCfg, pszDir, &pDirNode);
+                InsertConfigInteger(pDirNode, s_aToCopy[i].pszCfgmName, uValue);
+            }
+            else
+                LogRel(("Ignoring malformed 32-bit unsigned integer config value '%s' = '%s': %Rrc\n", szExtra, strTmp.c_str(), vrc));
+        }
     }