Changeset 30934 in vbox for trunk/src/VBox/Main/SystemPropertiesImpl.cpp

Timestamp:

Jul 20, 2010 4:53:40 PM (14 years ago)

Author:

vboxsync

Message:

Main: automatically fix host-specific audio drivers when loading machine settings

File:

• trunk/src/VBox/Main/SystemPropertiesImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -29 +29 @@
 #include <iprt/path.h>
 #include <iprt/dir.h>
-#include <iprt/process.h>
-#include <iprt/ldr.h>
 #include <iprt/cpp/utils.h>
 
@@ -117 +115 @@
         }
     }
-
-    /* Driver defaults which are OS specific */
-#if defined(RT_OS_WINDOWS)
-# ifdef VBOX_WITH_WINMM
-    mDefaultAudioDriver = AudioDriverType_WinMM;
-# else /* VBOX_WITH_WINMM */
-    mDefaultAudioDriver = AudioDriverType_DirectSound;
-# endif /* !VBOX_WITH_WINMM */
-#elif defined(RT_OS_SOLARIS)
-    mDefaultAudioDriver = AudioDriverType_SolAudio;
-#elif defined(RT_OS_LINUX)
-# if defined(VBOX_WITH_PULSE)
-    /* Check for the pulse library & that the pulse audio daemon is running. */
-    if (RTProcIsRunningByName("pulseaudio") &&
-        RTLdrIsLoadable("libpulse.so.0"))
-        mDefaultAudioDriver = AudioDriverType_Pulse;
-    else
-# endif /* VBOX_WITH_PULSE */
-# if defined(VBOX_WITH_ALSA)
-        /* Check if we can load the ALSA library */
-        if (RTLdrIsLoadable("libasound.so.2"))
-            mDefaultAudioDriver = AudioDriverType_ALSA;
-        else
-# endif /* VBOX_WITH_ALSA */
-            mDefaultAudioDriver = AudioDriverType_OSS;
-#elif defined(RT_OS_DARWIN)
-    mDefaultAudioDriver = AudioDriverType_CoreAudio;
-#elif defined(RT_OS_OS2)
-    mDefaultAudioDriver = AudioDriverType_MMP;
-#elif defined(RT_OS_FREEBSD)
-    mDefaultAudioDriver = AudioDriverType_OSS;
-#else
-    mDefaultAudioDriver = AudioDriverType_Null;
-#endif
 
     /* Confirm a successful initialization */
@@ -805 +769 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aAudioDriver = mDefaultAudioDriver;
+    *aAudioDriver = settings::MachineConfigFile::getHostDefaultAudioDriver();
 
     return S_OK;