Changeset 95364 in vbox for trunk/src/VBox/Frontends/VBoxManage

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

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageInfo.cpp (modified) (3 diffs)
• VBoxManageList.cpp (modified) (1 diff)
• VBoxManageModifyVM.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -2159 +2159 @@
             switch (enmDrvType)
             {
+                case AudioDriverType_Default:
+                    if (details == VMINFO_MACHINEREADABLE)
+                        pszDrv = "default";
+                    else
+                        pszDrv = Info::tr("Default");
+                    break;
                 case AudioDriverType_Null:
                     if (details == VMINFO_MACHINEREADABLE)
@@ -2164 +2170 @@
                     else
                         pszDrv = Info::tr("Null");
-                    break;
-                case AudioDriverType_WinMM:
-                    if (details == VMINFO_MACHINEREADABLE)
-                        pszDrv = "winmm";
-                    else
-                        pszDrv = "WINMM";
-                    break;
-                case AudioDriverType_DirectSound:
-                    if (details == VMINFO_MACHINEREADABLE)
-                        pszDrv = "dsound";
-                    else
-                        pszDrv = "DSOUND";
                     break;
                 case AudioDriverType_OSS:
@@ -2194 +2188 @@
                     else
                         pszDrv = "PulseAudio";
+                    break;
+                case AudioDriverType_WinMM:
+                    if (details == VMINFO_MACHINEREADABLE)
+                        pszDrv = "winmm";
+                    else
+                        pszDrv = "WINMM";
+                    break;
+                case AudioDriverType_DirectSound:
+                    if (details == VMINFO_MACHINEREADABLE)
+                        pszDrv = "dsound";
+                    else
+                        pszDrv = "DirectSound";
+                    break;
+                case AudioDriverType_WAS:
+                    if (details == VMINFO_MACHINEREADABLE)
+                        pszDrv = "was";
+                    else
+                        pszDrv = "Windows Audio Session (WAS)";
                     break;
                 case AudioDriverType_CoreAudio:

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -844 +844 @@
     switch (enmAudio)
     {
-        case AudioDriverType_Null:          psz = List::tr("Null"); break;
-        case AudioDriverType_WinMM:         psz = "WinMM";          break;
-        case AudioDriverType_OSS:           psz = "OSS";            break;
-        case AudioDriverType_ALSA:          psz = "ALSA";           break;
-        case AudioDriverType_DirectSound:   psz = "DirectSound";    break;
-        case AudioDriverType_CoreAudio:     psz = "CoreAudio";      break;
-        case AudioDriverType_MMPM:          psz = "MMPM";           break;
-        case AudioDriverType_Pulse:         psz = "Pulse";          break;
-        case AudioDriverType_SolAudio:      psz = "SolAudio";       break;
+        case AudioDriverType_Default:       psz = List::tr("Default");     break;
+        case AudioDriverType_Null:          psz = List::tr("Null");        break;
+        case AudioDriverType_OSS:           psz = "OSS";                   break;
+        case AudioDriverType_ALSA:          psz = "ALSA";                  break;
+        case AudioDriverType_Pulse:         psz = "PulseAudio";            break;
+        case AudioDriverType_WinMM:         psz = "WinMM";                 break;
+        case AudioDriverType_DirectSound:   psz = "DirectSound";           break;
+        case AudioDriverType_WAS:           psz = "Windows Audio Session"; break;
+        case AudioDriverType_CoreAudio:     psz = "CoreAudio";             break;
+        case AudioDriverType_SolAudio:      psz = "SolAudio";              break;
+        case AudioDriverType_MMPM:          psz = "MMPM";                  break;
         default:                            psz = List::tr("Unknown");
     }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -2576 +2576 @@
  * saved state. The GUI also might learn this trick if it doesn't use it
  * already. */
-
                 /* disable? */
                 if (!RTStrICmp(ValueUnion.psz, "none"))
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(false));
+                }
+                else if (!RTStrICmp(ValueUnion.psz, "default"))
+                {
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Default));
+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
                 }
                 else if (!RTStrICmp(ValueUnion.psz, "null"))
@@ -2598 +2602 @@
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_DirectSound));
+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
+                }
+                else if (!RTStrICmp(ValueUnion.psz, "was"))
+                {
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_was));
                     CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
                 }