Index: /trunk/src/VBox/Main/xml/Settings.cpp
===================================================================
--- /trunk/src/VBox/Main/xml/Settings.cpp	(revision 61911)
+++ /trunk/src/VBox/Main/xml/Settings.cpp	(revision 61912)
@@ -3650,5 +3650,5 @@
         else if ( (strTemp == "DIRECTSOUND") || (strTemp == "DSOUND") )
             aa.driverType = AudioDriverType_DirectSound;
-        else if (strTemp == "SOLAUDIO")
+        else if (strTemp == "SOLAUDIO") /* Deprecated -- Solaris will use OSS by default now. */
             aa.driverType = AudioDriverType_SolAudio;
         else if (strTemp == "ALSA")
@@ -6697,27 +6697,14 @@
         case AudioDriverType_Null:
 #ifdef RT_OS_WINDOWS
-# ifdef VBOX_WITH_WINMM
-        case AudioDriverType_WinMM:
-# endif
         case AudioDriverType_DirectSound:
-#endif /* RT_OS_WINDOWS */
-#ifdef RT_OS_SOLARIS
-        case AudioDriverType_SolAudio:
 #endif
-#ifdef RT_OS_LINUX
-# ifdef VBOX_WITH_ALSA
+#ifdef VBOX_WITH_ALSA
         case AudioDriverType_ALSA:
-# endif
-# ifdef VBOX_WITH_PULSE
+#endif
+#ifdef VBOX_WITH_PULSE
         case AudioDriverType_Pulse:
-# endif
-#endif /* RT_OS_LINUX */
-#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS)
+#endif
+#ifdef VBOX_WITH_OSS
         case AudioDriverType_OSS:
-#endif
-#ifdef RT_OS_FREEBSD
-# ifdef VBOX_WITH_PULSE
-        case AudioDriverType_Pulse:
-# endif
 #endif
 #ifdef RT_OS_DARWIN
@@ -6737,5 +6724,6 @@
  * host platform. On Linux, this will check at runtime whether PulseAudio
  * or ALSA are actually supported on the first call.
- * @return
+ *
+ * @return Default audio driver type for this host platform.
  */
 /*static*/
@@ -6743,13 +6731,11 @@
 {
 #if defined(RT_OS_WINDOWS)
-# ifdef VBOX_WITH_WINMM
-    return AudioDriverType_WinMM;
-# else /* VBOX_WITH_WINMM */
     return AudioDriverType_DirectSound;
-# endif /* !VBOX_WITH_WINMM */
 #elif defined(RT_OS_SOLARIS)
-    return AudioDriverType_SolAudio;
+# ifdef VBOX_WITH_OSS
+    return AudioDriverType_OSS;
+# endif
 #elif defined(RT_OS_LINUX)
-    // on Linux, we need to check at runtime what's actually supported...
+    /* On Linux, we need to check at runtime what's actually supported. */
     static RTCLockMtx s_mtx;
     static AudioDriverType_T s_linuxDriver = -1;
@@ -6757,5 +6743,5 @@
     if (s_linuxDriver == (AudioDriverType_T)-1)
     {
-# if defined(VBOX_WITH_PULSE)
+# ifdef VBOX_WITH_PULSE
         /* Check for the pulse library & that the pulse audio daemon is running. */
         if (RTProcIsRunningByName("pulseaudio") &&
@@ -6764,5 +6750,5 @@
         else
 # endif /* VBOX_WITH_PULSE */
-# if defined(VBOX_WITH_ALSA)
+# ifdef VBOX_WITH_ALSA
             /* Check if we can load the ALSA library */
              if (RTLdrIsLoadable("libasound.so.2"))
@@ -6773,5 +6759,4 @@
     }
     return s_linuxDriver;
-// end elif defined(RT_OS_LINUX)
 #elif defined(RT_OS_DARWIN)
     return AudioDriverType_CoreAudio;
@@ -6779,8 +6764,11 @@
     return AudioDriverType_MMPM;
 #elif defined(RT_OS_FREEBSD)
+# ifdef VBOX_WITH_OSS
     return AudioDriverType_OSS;
-#else
+# endif
+#endif
+
+    /* Return NULL driver as a fallback if nothing of the above is available. */
     return AudioDriverType_Null;
-#endif
 }