Changeset 16588 in vbox

Timestamp:

Feb 9, 2009 2:01:38 PM (16 years ago)

Author:

vboxsync

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

42553

Message:

Main: try to set a default audio driver

Location:

trunk/src/VBox/Main

Files:

• AudioAdapterImpl.cpp (modified) (2 diffs)
• include/AudioAdapterImpl.h (modified) (1 diff)

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -352 +352 @@
      * nodes are assigned in the Data::Data() constructor and don't do it
      * here. It implies that this method may only be called after constructing
-     * a new BIOSSettings object while all its data fields are in the default
+     * a new AudioAdapter object while all its data fields are in the default
      * values. Exceptions are fields whose creation time defaults don't match
      * values that should be applied when these fields are not explicitly set
@@ -366 +366 @@
     mData->mEnabled = audioAdapterNode.value <bool> ("enabled");
 
-    /* now check the audio adapter (not required, default is AC97) */
+    /* now check the audio adapter */
     const char *controller = audioAdapterNode.stringValue ("controller");
     if (strcmp (controller, "SB16") == 0)
         mData->mAudioController = AudioControllerType_SB16;
-    else
+    else if (strcmp (controller, "AC97") == 0)
         mData->mAudioController = AudioControllerType_AC97;
 
     /* now check the audio driver (required) */
     const char *driver = audioAdapterNode.stringValue ("driver");
-    mData->mAudioDriver = AudioDriverType_Null;
     if      (strcmp (driver, "Null") == 0)
-        ; /* Null has been set above */
+        mData->mAudioDriver = AudioDriverType_Null;
 #ifdef RT_OS_WINDOWS
     else if (strcmp (driver, "WinMM") == 0)

trunk/src/VBox/Main/include/AudioAdapterImpl.h

@@ -41 +41 @@
         Data() {
             mEnabled = false;
+#if defined (RT_OS_WINDOWS)
+# ifdef VBOX_WITH_WINMM
+            mAudioDriver = AudioDriverType_WinMM;
+# else /* VBOX_WITH_WINMM */
+            mAudioDriver = AudioDriverType_DirectSound;
+# endif /* !VBOX_WITH_WINMM */
+#elif defined (RT_OS_SOLARIS)
+            mAudioDriver = AudioDriverType_SolAudio;
+#elif defined (RT_OS_LINUX)
+# if defined (VBOX_WITH_ALSA)
+            mAudioDriver = AudioDriverType_ALSA;
+# else /* VBOX_WITH_ALSA */
+            mAudioDriver = AudioDriverType_OSS;
+# endif /* !VBOX_WITH_ALSA */
+#elif defined (RT_OS_DARWIN)
+            mAudioDriver = AudioDriverType_CoreAudio;
+#elif defined (RT_OS_OS2)
+            mAudioDriver = AudioDriverType_MMP;;
+#else
             mAudioDriver = AudioDriverType_Null;
+#endif
             mAudioController = AudioControllerType_AC97;
         }