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

Timestamp:

Jul 27, 2016 11:51:17 AM (9 years ago)

Author:

vboxsync

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

109154

Message:

Audio: Cleanup: Renamed VBOX_WITH_[OSS|ALSA|PULSE] -> VBOX_WITH_AUDIO_[OSS|ALSA|PULSE].

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -29 +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_AUDIO_OSS), VBOX_WITH_AUDIO_OSS) \
+        $(if $(VBOX_WITH_AUDIO_ALSA), VBOX_WITH_AUDIO_ALSA) \
+        $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE) \
         $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
         $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \

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

@@ -802 +802 @@
         {
             RTStrmPrintf(pStrm, ""
-#ifdef VBOX_WITH_OSS
+#ifdef VBOX_WITH_AUDIO_OSS
                                 "|oss"
 #endif
-#ifdef VBOX_WITH_ALSA
+#ifdef VBOX_WITH_AUDIO_ALSA
                                 "|alsa"
 #endif
-#ifdef VBOX_WITH_PULSE
+#ifdef VBOX_WITH_AUDIO_PULSE
                                 "|pulse"
 #endif
@@ -815 +815 @@
         if (fFreeBSD)
         {
-#ifdef VBOX_WITH_OSS
+#ifdef VBOX_WITH_AUDIO_OSS
             /* Get the line break sorted when dumping all option variants. */
             if (fDumpOpts)
@@ -825 +825 @@
                 RTStrmPrintf(pStrm, "|oss");
 #endif
-#ifdef VBOX_WITH_PULSE
+#ifdef VBOX_WITH_AUDIO_PULSE
             RTStrmPrintf(pStrm, "|pulse");
 #endif

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

@@ -2286 +2286 @@
                 }
 #endif /* RT_OS_WINDOWS */
-#ifdef VBOX_WITH_OSS
+#ifdef VBOX_WITH_AUDIO_OSS
                 else if (!RTStrICmp(ValueUnion.psz, "oss"))
                 {
@@ -2293 +2293 @@
                 }
 #endif
-#ifdef VBOX_WITH_ALSA
+#ifdef VBOX_WITH_AUDIO_ALSA
                 else if (!RTStrICmp(ValueUnion.psz, "alsa"))
                 {
@@ -2300 +2300 @@
                 }
 #endif
-#ifdef VBOX_WITH_PULSE
+#ifdef VBOX_WITH_AUDIO_PULSE
                 else if (!RTStrICmp(ValueUnion.psz, "pulse"))
                 {