Changeset 61413 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 2, 2016 1:24:16 PM (9 years ago)

Author:

vboxsync

Message:

Audio: Use the old audio code for now when doing a release. Set VBOX_WITH_AUDIO_STABLE to an empty value to enable the new audio code (default for non-release builds for now).

Location:

trunk/src/VBox/Devices

Files:

• Audio_old (added)
• Audio_old/AudioMixBuffer.cpp (added)
• Audio_old/AudioMixBuffer.h (added)
• Audio_old/AudioMixer.cpp (added)
• Audio_old/AudioMixer.h (added)
• Audio_old/DevIchAc97.cpp (added)
• Audio_old/DevIchHda.cpp (added)
• Audio_old/DevIchHdaCodec.cpp (added)
• Audio_old/DevIchHdaCodec.h (added)
• Audio_old/DevSB16.cpp (added)
• Audio_old/DrvAudio.cpp (added)
• Audio_old/DrvAudio.h (added)
• Audio_old/DrvAudioCommon.cpp (added)
• Audio_old/DrvHostALSAAudio.cpp (added)
• Audio_old/DrvHostCoreAudio.cpp (added)
• Audio_old/DrvHostDSound.cpp (added)
• Audio_old/DrvHostNullAudio.cpp (added)
• Audio_old/DrvHostOSSAudio.cpp (added)
• Audio_old/DrvHostPulseAudio.cpp (added)
• Audio_old/Makefile.kup (added)
• Audio_old/alsa_mangling.h (added)
• Audio_old/alsa_stubs.c (added)
• Audio_old/alsa_stubs.h (added)
• Audio_old/pulse_mangling.h (added)
• Audio_old/pulse_stubs.c (added)
• Audio_old/pulse_stubs.h (added)
• Audio_old/sys-queue.h (added)
• Audio_old/testcase (added)
• Audio_old/testcase/Makefile.kmk (added)
• Audio_old/testcase/tstAudioMixBuffer.cpp (added)
• Makefile.kmk (modified) (7 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -154 +154 @@
         VMMDev/VMMDevTesting.cpp \
         Network/DevPCNet.cpp \
-        Audio/DevIchAc97.cpp \
-        Audio/DevSB16.cpp \
-        Audio/DevIchHda.cpp \
-        Audio/DevIchHdaCodec.cpp \
         PC/DevDMA.cpp \
         PC/DevHPET.cpp \
@@ -544 +540 @@
  # --- Audio bits. ---
 
- if 0
+ if 0 # Not stable yet.
   VBoxDD_DEFS += VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT
   VBoxDD_DEFS += VBOX_WITH_HDA_51_SURROUND
  endif
 
+ VBoxDD_DEFS  += $(if $(VBOX_WITH_AUDIO_STABLE),VBOX_WITH_AUDIO_STABLE,)
+
  VBoxDD_SOURCES         += \
-   Audio/AudioMixBuffer.cpp \
-   Audio/AudioMixer.cpp \
-   Audio/DrvAudio.cpp \
-   Audio/DrvAudioCommon.cpp \
-   Audio/DrvHostNullAudio.cpp
+   $(VBOX_AUDIO_PATH_SOURCES)/DevIchAc97.cpp \
+   $(VBOX_AUDIO_PATH_SOURCES)/DevSB16.cpp \
+   $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp \
+   $(VBOX_AUDIO_PATH_SOURCES)/DevIchHdaCodec.cpp \
+   $(VBOX_AUDIO_PATH_SOURCES)/AudioMixBuffer.cpp \
+   $(VBOX_AUDIO_PATH_SOURCES)/AudioMixer.cpp \
+   $(VBOX_AUDIO_PATH_SOURCES)/DrvAudio.cpp \
+   $(VBOX_AUDIO_PATH_SOURCES)/DrvAudioCommon.cpp \
+   $(VBOX_AUDIO_PATH_SOURCES)/DrvHostNullAudio.cpp
 
  ifeq ($(KBUILD_TARGET),darwin)
   VBoxDD_SOURCES += \
-   Audio/DrvHostCoreAudio.cpp
+   $(VBOX_AUDIO_PATH_SOURCES)/DrvHostCoreAudio.cpp
  endif
 
  ifeq ($(KBUILD_TARGET),win)
   VBoxDD_SOURCES += \
-   Audio/DrvHostDSound.cpp
+   $(VBOX_AUDIO_PATH_SOURCES)/DrvHostDSound.cpp
  endif
 
@@ -570 +572 @@
    VBoxDD_DEFS    += VBOX_WITH_OSS
    VBoxDD_SOURCES += \
-        Audio/DrvHostOSSAudio.cpp
+        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostOSSAudio.cpp
   endif
 
@@ -576 +578 @@
    VBoxDD_DEFS    += VBOX_WITH_PULSE
    VBoxDD_SOURCES += \
-   Audio/DrvHostPulseAudio.cpp \
-   Audio/pulse_stubs.c
+   $(VBOX_AUDIO_PATH_SOURCES)/DrvHostPulseAudio.cpp \
+   $(VBOX_AUDIO_PATH_SOURCES)/pulse_stubs.c
   endif
 
@@ -583 +585 @@
    VBoxDD_DEFS    += VBOX_WITH_ALSA
    VBoxDD_SOURCES += \
-        Audio/DrvHostALSAAudio.cpp \
-        Audio/alsa_stubs.c
+        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostALSAAudio.cpp \
+        $(VBOX_AUDIO_PATH_SOURCES)/alsa_stubs.c
   endif
  endif
@@ -592 +594 @@
    VBoxDD_DEFS    += VBOX_WITH_OSS
    VBoxDD_SOURCES += \
-        Audio/DrvHostOSSAudio.cpp
+        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostOSSAudio.cpp
   endif
   ifdef VBOX_WITH_PULSE
    VBoxDD_DEFS    += VBOX_WITH_PULSE
    VBoxDD_SOURCES += \
-   Audio/DrvHostPulseAudio.cpp \
-   Audio/pulse_stubs.c
+   $(VBOX_AUDIO_PATH_SOURCES)/DrvHostPulseAudio.cpp \
+   $(VBOX_AUDIO_PATH_SOURCES)/pulse_stubs.c
   endif
  endif
@@ -604 +606 @@
  ifeq ($(KBUILD_TARGET),solaris)
   ifdef VBOX_WITH_OSS
-   VBoxDD_SOURCES += Audio/DrvHostOSSAudio.cpp
+   VBoxDD_SOURCES += $(VBOX_AUDIO_PATH_SOURCES)/DrvHostOSSAudio.cpp
    VBoxDD_DEFS    += VBOX_WITH_OSS
   endif