Changeset 73612 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Aug 10, 2018 10:16:36 AM (6 years ago)

Author:

vboxsync

Message:

Audio/Main: Added support for superseding extra-data values with driver-specific ones.

File:

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

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

@@ -3430 +3430 @@
 
 /**
- * Retrieves an uint32_t value from audio's extra data branch and returns a default value
- * if not found or an invalid value is found.
+ * Retrieves an uint32_t value from the audio driver's extra data branch
+ * (VBoxInternal2/Audio/<DriverName>/<Value>), or, if not found, use global branch
+ * (VBoxInternal2/Audio/<Value>).
+ *
+ * The driver branch always supersedes the global branch.
+ * If both branches are not found (empty), return the given default value.
  *
  * @return VBox status code.
@@ -3443 +3447 @@
                                          const char *pszDriverName, const char *pszValue, uint32_t uDefault)
 {
-    Utf8StrFmt strPath("VBoxInternal2/Audio/%s/%s", pszDriverName, pszValue);
-
     Utf8Str strTmp;
-    GetExtraDataBoth(pVirtualBox, pMachine, strPath.c_str(), &strTmp);
-
-    if (strTmp.isNotEmpty())
+
+    Utf8StrFmt strPathDrv("VBoxInternal2/Audio/%s/%s", pszDriverName, pszValue);
+    GetExtraDataBoth(pVirtualBox, pMachine, strPathDrv.c_str(), &strTmp);
+    if (strTmp.isEmpty())
+    {
+        Utf8StrFmt strPathGlobal("VBoxInternal2/Audio/%s", pszValue);
+        GetExtraDataBoth(pVirtualBox, pMachine, strPathGlobal.c_str(), &strTmp);
+        if (strTmp.isNotEmpty())
+            return strTmp.toUInt32();
+    }
+    else /* Return driver-specific value. */
         return strTmp.toUInt32();