Changeset 62056 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jul 6, 2016 2:24:20 PM (9 years ago)

Author:

vboxsync

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

108526

Message:

Audio: More cleanup for backend defines.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxManageHelp.cpp (modified) (3 diffs)
• VBoxManageModifyVM.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2015 Oracle Corporation
+# Copyright (C) 2006-2016 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
 VBOX_COMMON_VBOXMANAGE_DEFS = \
         $(if $(VBOX_WITH_AHCI), VBOX_WITH_AHCI) \
-        $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
         $(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST) \
         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
@@ -30 +29 @@
         $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
         $(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \
+        $(if $(VBOX_WITH_OSS), VBOX_WITH_OSS) \
+        $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
         $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
-        $(if $(VBOX_WITH_SOLARIS_OSS), VBOX_WITH_SOLARIS_OSS) \
         $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \
         $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -797 +797 @@
 #else
             RTStrmPrintf(pStrm, "|dsound");
-#endif
         }
-        if (fSolaris)
+        if (fLinux || fSolaris)
         {
-            RTStrmPrintf(pStrm, "|solaudio"
-#ifdef VBOX_WITH_SOLARIS_OSS
-                                    "|oss"
-#endif
-                        );
-        }
-        if (fLinux)
-        {
+#ifdef VBOX_WITH_OSS
             RTStrmPrintf(pStrm, "|oss"
+#endif
 #ifdef VBOX_WITH_ALSA
-                                    "|alsa"
+                                "|alsa"
 #endif
 #ifdef VBOX_WITH_PULSE
-                                    "|pulse"
+                                "|pulse"
 #endif
                         );
@@ -820 +813 @@
         if (fFreeBSD)
         {
+#ifdef VBOX_WITH_OSS
             /* Get the line break sorted when dumping all option variants. */
             if (fDumpOpts)
@@ -828 +822 @@
             else
                 RTStrmPrintf(pStrm, "|oss");
+#endif
 #ifdef VBOX_WITH_PULSE
             RTStrmPrintf(pStrm, "|pulse");

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -2286 +2286 @@
                 }
 #endif /* RT_OS_WINDOWS */
-#ifdef RT_OS_LINUX
-# ifdef VBOX_WITH_ALSA
+#ifdef VBOX_WITH_OSS
+                else if (!RTStrICmp(ValueUnion.psz, "oss"))
+                {
+                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
+                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
+                }
+#endif
+#ifdef VBOX_WITH_ALSA
                 else if (!RTStrICmp(ValueUnion.psz, "alsa"))
                 {
@@ -2293 +2299 @@
                     CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
                 }
-# endif
-# ifdef VBOX_WITH_PULSE
+#endif
+#ifdef VBOX_WITH_PULSE
                 else if (!RTStrICmp(ValueUnion.psz, "pulse"))
                 {
@@ -2300 +2306 @@
                     CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
                 }
-# endif
-#endif /* !RT_OS_LINUX */
-#ifdef RT_OS_SOLARIS
-                else if (!RTStrICmp(ValueUnion.psz, "solaudio"))
-                {
-                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_SolAudio));
-                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-                }
-#endif /* !RT_OS_SOLARIS */
-#ifdef RT_OS_FREEBSD
-                else if (!RTStrICmp(ValueUnion.psz, "oss"))
-                {
-                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
-                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-                }
-# ifdef VBOX_WITH_PULSE
-                else if (!RTStrICmp(ValueUnion.psz, "pulse"))
-                {
-                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Pulse));
-                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-                }
-# endif
-#endif /* !RT_OS_FREEBSD */
+#endif
 #ifdef RT_OS_DARWIN
                 else if (!RTStrICmp(ValueUnion.psz, "coreaudio"))
@@ -2329 +2313 @@
                     CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
                 }
-
 #endif /* !RT_OS_DARWIN */
-# if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(VBOX_WITH_SOLARIS_OSS)
-                else if (!RTStrICmp(ValueUnion.psz, "oss"))
-                {
-                    CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
-                    CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true));
-                }
-# endif
                 else
                 {