Changeset 62176 in vbox

Timestamp:

Jul 12, 2016 8:11:57 AM (9 years ago)

Author:

vboxsync

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

108683

Message:

s/VBOX_WITH_AUDIO_STABLE/VBOX_WITH_AUDIO_50/

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• include/VBox/vmm/pdmaudioifs.h (modified) (2 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (3 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -235 +235 @@
 # export VBOX_EFI_SH_MODE           = release
 # export VBOX_EXTPACKS_SH_MODE      = release
-# VBOX_WITH_AUDIO_STABLE           := 1
 endif
 
@@ -696 +695 @@
 # Enable audio support for VRDE.
 VBOX_WITH_VRDE_AUDIO = 1
+# Enable to use the VBox 5.0 audio framework
+#VBOX_WITH_AUDIO_50 := 1
 # Use the VRDE external authentication library from VBoxSVC.
 if1of ($(KBUILD_TARGET), win)
@@ -1170 +1171 @@
 # This can be overriden in LocalConfig.kmk.
 #
-ifdef VBOX_WITH_AUDIO_STABLE
+ifdef VBOX_WITH_AUDIO_50
  VBOX_AUDIO_PATH_SOURCES=Audio_old
  VBOX_AUDIO_FILE_SUFFIX=_old

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -32 +32 @@
 #include <iprt/list.h>
 
-#ifdef VBOX_WITH_AUDIO_STABLE
+#ifdef VBOX_WITH_AUDIO_50
 # undef ___VBox_vmm_pdmaudioifs_h
 # include "pdmaudioifs_old.h"
@@ -957 +957 @@
 /** @} */
 
-#endif /* VBOX_WITH_AUDIO_STABLE */
+#endif /* VBOX_WITH_AUDIO_50 */
 
 #endif /* !___VBox_vmm_pdmaudioifs_h */

trunk/src/VBox/Devices/Makefile.kmk

@@ -545 +545 @@
  endif
 
- VBoxDD_DEFS  += $(if $(VBOX_WITH_AUDIO_STABLE),VBOX_WITH_AUDIO_STABLE,)
+ VBoxDD_DEFS  += $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,)
 
  VBoxDD_SOURCES         += \
@@ -905 +905 @@
         VMMDev/VMMDevTesting.cpp
 
-  VBoxDDRC_DEFS         += $(if $(VBOX_WITH_AUDIO_STABLE),VBOX_WITH_AUDIO_STABLE,)
+  VBoxDDRC_DEFS         += $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,)
   VBoxDDRC_SOURCES      += \
         $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp
@@ -1089 +1089 @@
  VBoxDDR0_SOURCES.win += Parallel/DrvHostParallel.cpp
 
- VBoxDDR0_DEFS          += $(if $(VBOX_WITH_AUDIO_STABLE),VBOX_WITH_AUDIO_STABLE,)
+ VBoxDDR0_DEFS          += $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,)
  VBoxDDR0_SOURCES       += \
         $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp

trunk/src/VBox/Main/Makefile.kmk

@@ -780 +780 @@
 # Audio bits.
 VBoxC_DEFS    += \
-        $(if $(VBOX_WITH_AUDIO_STABLE), VBOX_WITH_AUDIO_STABLE,)
+        $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,)
 
 VBoxC_SOURCES += \