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

Timestamp:

Apr 23, 2021 11:53:54 AM (4 years ago)

Author:

vboxsync

Message:

Audio: Use HostAudioWas on windows 10 instead of DSound. Only set the StreamName CFGM value for host audio drivers who needs it (PulseAudio and now WAS). Renamed StreamName to VmName. Added VmUuid to WAS. bugref:9890

File:

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

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

@@ -3135 +3135 @@
                     break;
 #ifdef RT_OS_WINDOWS
-# ifdef VBOX_WITH_WINMM
+#ifdef VBOX_WITH_WINMM
                 case AudioDriverType_WinMM:
 #  error "Port WinMM audio backend!" /** @todo Still needed? */
@@ -3141 +3141 @@
 # endif
                 case AudioDriverType_DirectSound:
+                    /* Use the windows audio session (WAS) API rather than Direct Sound on windows
+                       versions we've tested it on (currently W10+).  Since Vista, Direct Sound has
+                       been emulated on top of WAS according to the docs, so better use WAS directly. */
                     pszAudioDriver = "DSoundAudio";
+                    if (RTSystemGetNtVersion() >= RTSYSTEM_MAKE_NT_VERSION(10,0,0))
+                        pszAudioDriver = "HostAudioWas";
                     break;
 #endif /* RT_OS_WINDOWS */
@@ -3728 +3733 @@
     PCFGMNODE pLunL1;
     InsertConfigNode(pLUN, "AttachedDriver", &pLunL1);
+    InsertConfigString(pLunL1, "Driver", pszDrvName);
     InsertConfigNode(pLunL1, "Config", &pCfg);
-    Bstr bstrTmp;
-    hrc = pMachine->COMGETTER(Name)(bstrTmp.asOutParam());                                  H();
-    InsertConfigString(pCfg, "StreamName", bstrTmp);
-    InsertConfigString(pLunL1, "Driver", pszDrvName);
+
+#ifdef RT_OS_WINDOWS
+    if (strcmp(pszDrvName, "HostAudioWas") == 0)
+    {
+        Bstr bstrTmp;
+        hrc = pMachine->COMGETTER(Id)(bstrTmp.asOutParam());                                    H();
+        InsertConfigString(pCfg, "VmUuid", bstrTmp);
+    }
+#endif
+
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_LINUX)
+    if (   strcmp(pszDrvName, "HostAudioWas") == 0
+        || strcmp(pszDrvName, "PulseAudio") == 0)
+    {
+        Bstr bstrTmp;
+        hrc = pMachine->COMGETTER(Name)(bstrTmp.asOutParam());                                  H();
+        InsertConfigString(pCfg, "VmName", bstrTmp);
+    }
+#endif
 
     LogFlowFunc(("szDrivName=%s\n", pszDrvName));