Changeset 103529 in vbox

Timestamp:

Feb 22, 2024 11:36:39 AM (12 months ago)

Author:

vboxsync

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

161872

Message:

Validation Kit: Try using AudioDriverType_Default for >= 7.1 in SessionWrapper::setupAudio() if no audio driver is explicitly specified, to also test the default handling.

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -2399 +2399 @@
 
         if eAudioDriverType is None:
-            sHost = utils.getHostOs()
-            if   sHost == 'darwin':    eAudioDriverType = vboxcon.AudioDriverType_CoreAudio;
-            elif sHost == 'win':       eAudioDriverType = vboxcon.AudioDriverType_DirectSound;
-            elif sHost == 'linux':     eAudioDriverType = vboxcon.AudioDriverType_Pulse;
-            elif sHost == 'solaris':   eAudioDriverType = vboxcon.AudioDriverType_OSS;
-            else:
-                reporter.error('PORTME: Do not know which audio driver to pick for: %s!' % (sHost,));
-                eAudioDriverType = vboxcon.AudioDriverType_Null;
+            if self.fpApiVer >= 7.1:
+                eAudioDriverType = vboxcon.AudioDriverType_Default;
+            else:
+                sHost = utils.getHostOs()
+                if   sHost == 'darwin':    eAudioDriverType = vboxcon.AudioDriverType_CoreAudio;
+                elif sHost == 'win':       eAudioDriverType = vboxcon.AudioDriverType_DirectSound;
+                elif sHost == 'linux':     eAudioDriverType = vboxcon.AudioDriverType_Pulse;
+                elif sHost == 'solaris':   eAudioDriverType = vboxcon.AudioDriverType_OSS;
+                else:
+                    reporter.error('PORTME: Do not know which audio driver to pick for: %s!' % (sHost,));
+                    eAudioDriverType = vboxcon.AudioDriverType_Null;
 
         try:    oAdapter.audioDriver = eAudioDriverType;
@@ -2420 +2423 @@
         except: return reporter.errorXcpt('Failed to set the "enabledOut" property to %s.' % (fEnable,));
 
-        reporter.log('set audio adapter type to %d, driver to %d, and enabled to %s (input is %s, output is %s)'
+        reporter.log('set audio controller type to %d, driver to %d, and enabled to %s (input is %s, output is %s)'
                      % (eAudioControllerType, eAudioDriverType, fEnable, fEnableIn, fEnableOut,));
         self.oTstDrv.processPendingEvents();