Changeset 95364 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Jun 24, 2022 4:51:21 PM (3 years ago)

Author:

vboxsync

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

151958

Message:

Main/FE: Added new audio driver type "default" to make it possible to move VMs (appliances) between different platforms without the need of changing the audio driver explicitly. When the "default" driver is selected, the best audio backend option for a platform will be used.

While at it, also added the "WAS" (Windows Audio Session) driver type for which we only had a hack so far. This now can be explicitly selected, also by the frontends. bugref:10051

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (7 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -4605 +4605 @@
         // settings before 1.3 used lower case so make sure this is case-insensitive
         strTemp.toUpper();
-        if (strTemp == "NULL")
+        if (strTemp == "DEFAULT")
+            aa.driverType = AudioDriverType_Default;
+        else if (strTemp == "NULL")
             aa.driverType = AudioDriverType_Null;
+        else if (strTemp == "WAS")
+            aa.driverType = AudioDriverType_WAS;
         else if (strTemp == "WINMM")
             aa.driverType = AudioDriverType_WinMM;
@@ -4621 +4625 @@
         else if (strTemp == "COREAUDIO")
             aa.driverType = AudioDriverType_CoreAudio;
-        else if (strTemp == "MMPM")
+        else if (strTemp == "MMPM") /* Deprecated; only kept for backwards compatibility. */
             aa.driverType = AudioDriverType_MMPM;
         else
@@ -7314 +7318 @@
         switch (hw.audioAdapter.driverType)
         {
+            case AudioDriverType_Default: pcszDriver = "Default"; break;
             case AudioDriverType_WinMM: pcszDriver = "WinMM"; break;
             case AudioDriverType_DirectSound: pcszDriver = "DirectSound"; break;
+            case AudioDriverType_WAS: pcszDriver = "WAS"; break;
+            case AudioDriverType_ALSA: pcszDriver = "ALSA"; break;
+            case AudioDriverType_OSS: pcszDriver = "OSS"; break;
+            case AudioDriverType_Pulse: pcszDriver = "Pulse"; break;
+            case AudioDriverType_CoreAudio: pcszDriver = "CoreAudio"; break;
             case AudioDriverType_SolAudio: pcszDriver = "SolAudio"; break;
-            case AudioDriverType_ALSA: pcszDriver = "ALSA"; break;
-            case AudioDriverType_Pulse: pcszDriver = "Pulse"; break;
-            case AudioDriverType_OSS: pcszDriver = "OSS"; break;
-            case AudioDriverType_CoreAudio: pcszDriver = "CoreAudio"; break;
             case AudioDriverType_MMPM: pcszDriver = "MMPM"; break;
             default: /*case AudioDriverType_Null:*/ pcszDriver = "Null"; break;
@@ -8236 +8242 @@
  * the current host platform. For example, this would return false
  * for AudioDriverType_DirectSound when compiled on a Linux host.
- * @param drv AudioDriverType_* enum to test.
- * @return true only if the current host supports that driver.
+ *
+*  @return \c true if the current host supports the driver, \c false if not.
+ * @param enmDrvType            AudioDriverType_* enum to test.
  */
 /*static*/
-bool MachineConfigFile::isAudioDriverAllowedOnThisHost(AudioDriverType_T drv)
-{
-    switch (drv)
-    {
+bool MachineConfigFile::isAudioDriverAllowedOnThisHost(AudioDriverType_T enmDrvType)
+{
+    switch (enmDrvType)
+    {
+        case AudioDriverType_Default:
+            RT_FALL_THROUGH();
         case AudioDriverType_Null:
 #ifdef RT_OS_WINDOWS
+        case AudioDriverType_WAS:
+            /* We only support WAS on systems we tested so far (Vista+). */
+            if (RTSystemGetNtVersion() < RTSYSTEM_MAKE_NT_VERSION(6,1,0))
+                break;
+            RT_FALL_THROUGH();
         case AudioDriverType_DirectSound:
 #endif
@@ -8275 +8289 @@
  * or ALSA are actually supported on the first call.
  *
+ * When more than one supported audio stack is available, choose the most suited
+ * (probably newest in most cases) one.
+ *
  * @return Default audio driver type for this host platform.
  */
@@ -8281 +8298 @@
 {
 #if defined(RT_OS_WINDOWS)
+    if (RTSystemGetNtVersion() >= RTSYSTEM_MAKE_NT_VERSION(6,1,0))
+        return AudioDriverType_WAS;
     return AudioDriverType_DirectSound;
 
@@ -8301 +8320 @@
              if (RTLdrIsLoadable("libasound.so.2"))
                 s_enmLinuxDriver = AudioDriverType_ALSA;
-        else
 # endif /* VBOX_WITH_AUDIO_ALSA */
-            s_enmLinuxDriver = AudioDriverType_OSS;
+# ifdef VBOX_WITH_AUDIO_OSS
+             else
+                s_enmLinuxDriver = AudioDriverType_OSS;
+# endif /* VBOX_WITH_AUDIO_OSS */
     }
     return s_enmLinuxDriver;