Changeset 62586 in vbox for trunk

Timestamp:

Jul 27, 2016 12:00:39 PM (8 years ago)

Author:

vboxsync

Message:

Audio/VBoxDD: Cleanup.

Location:

trunk/src/VBox/Devices/build

Files:

• VBoxDD.cpp (modified) (2 diffs)
• VBoxDD.h (modified) (2 diffs)

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -288 +288 @@
         return rc;
 #endif
-#if defined(RT_OS_LINUX)
-# ifdef VBOX_WITH_AUDIO_PULSE
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostPulseAudio);
-    if (RT_FAILURE(rc))
-        return rc;
-# endif
-# ifdef VBOX_WITH_AUDIO_ALSA
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostALSAAudio);
-    if (RT_FAILURE(rc))
-        return rc;
-# endif
-# ifdef VBOX_WITH_AUDIO_OSS
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
-    if (RT_FAILURE(rc))
-        return rc;
-# endif
-#endif /* RT_OS_LINUX */
-#if defined(RT_OS_FREEBSD)
-# ifdef VBOX_WITH_AUDIO_OSS
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
-    if (RT_FAILURE(rc))
-        return rc;
-# endif
-#endif
 #if defined(RT_OS_DARWIN)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostCoreAudio);
@@ -317 +293 @@
         return rc;
 #endif
-#if defined(RT_OS_SOLARIS)
-# ifdef VBOX_WITH_AUDIO_OSS
+#ifdef VBOX_WITH_AUDIO_ALSA
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostALSAAudio);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
+#ifdef VBOX_WITH_AUDIO_OSS
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
     if (RT_FAILURE(rc))
         return rc;
-# endif
+#endif
+#ifdef VBOX_WITH_AUDIO_PULSE
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostPulseAudio);
+    if (RT_FAILURE(rc))
+        return rc;
 #endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvACPI);

trunk/src/VBox/Devices/build/VBoxDD.h

@@ -125 +125 @@
 extern const PDMDRVREG g_DrvHostDSound;
 #endif
+#if defined(RT_OS_DARWIN)
+extern const PDMDRVREG g_DrvHostCoreAudio;
+#endif
 #ifdef VBOX_WITH_AUDIO_OSS
 extern const PDMDRVREG g_DrvHostOSSAudio;
@@ -133 +136 @@
 #ifdef VBOX_WITH_AUDIO_PULSE
 extern const PDMDRVREG g_DrvHostPulseAudio;
-#endif
-#if defined(RT_OS_DARWIN)
-extern const PDMDRVREG g_DrvHostCoreAudio;
 #endif
 extern const PDMDRVREG g_DrvACPI;