VirtualBox

Changeset 61413 in vbox


Ignore:
Timestamp:
Jun 2, 2016 1:24:16 PM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
107730
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
Files:
35 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r61355 r61413  
    228228ifeq ($(int-mod $(VBOX_VERSION_BUILD),2),0)
    229229  VBOX_RELEASE_EXACT_MATCH=1
     230  # Decide whether to use the stable (5.0) audio code or not.
     231  VBOX_WITH_AUDIO_STABLE:=1
    230232endif
    231233ifneq ($(VBOX_RELEASE_EXACT_MATCH),)
    … …  
    432434# Enable new PS/2 mouse emulation.
    433435VBOX_WITH_NEW_PS2M = 1
     436ifdef VBOX_WITH_AUDIO_STABLE
     437 VBOX_AUDIO_PATH_SOURCES=Audio_old
     438 VBOX_AUDIO_FILE_SUFFIX=_old
     439else
     440 VBOX_AUDIO_PATH_SOURCES=Audio
     441 VBOX_AUDIO_FILE_SUFFIX=
     442endif
    434443# Enable OSS audio support.
    435444VBOX_WITH_OSS = 1

  • trunk/include/VBox/vmm/pdmaudioifs.h

    r61386 r61413  
    3232#include <iprt/list.h>
    3333
     34#ifdef VBOX_WITH_AUDIO_STABLE
     35# undef ___VBox_vmm_pdmaudioifs_h
     36# include "pdmaudioifs_old.h"
     37#else
    3438
    3539/** @defgroup grp_pdm_ifs_audio     PDM Audio Interfaces
    … …  
    863867/** @} */
    864868
     869#endif /* VBOX_WITH_AUDIO_STABLE */
     870
    865871#endif /* !___VBox_vmm_pdmaudioifs_h */
    866872

  • trunk/src/VBox/Devices/Makefile.kmk

    r61339 r61413  
    154154        VMMDev/VMMDevTesting.cpp \
    155155        Network/DevPCNet.cpp \
    156         Audio/DevIchAc97.cpp \
    157         Audio/DevSB16.cpp \
    158         Audio/DevIchHda.cpp \
    159         Audio/DevIchHdaCodec.cpp \
    160156        PC/DevDMA.cpp \
    161157        PC/DevHPET.cpp \
    … …  
    544540 # --- Audio bits. ---
    545541
    546  if 0
     542 if 0 # Not stable yet.
    547543  VBoxDD_DEFS += VBOX_WITH_HDA_INTERLEAVING_STREAMS_SUPPORT
    548544  VBoxDD_DEFS += VBOX_WITH_HDA_51_SURROUND
    549545 endif
    550546
     547 VBoxDD_DEFS  += $(if $(VBOX_WITH_AUDIO_STABLE),VBOX_WITH_AUDIO_STABLE,)
     548
    551549 VBoxDD_SOURCES         += \
    552    Audio/AudioMixBuffer.cpp \
    553    Audio/AudioMixer.cpp \
    554    Audio/DrvAudio.cpp \
    555    Audio/DrvAudioCommon.cpp \
    556    Audio/DrvHostNullAudio.cpp
     550   $(VBOX_AUDIO_PATH_SOURCES)/DevIchAc97.cpp \
     551   $(VBOX_AUDIO_PATH_SOURCES)/DevSB16.cpp \
     552   $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp \
     553   $(VBOX_AUDIO_PATH_SOURCES)/DevIchHdaCodec.cpp \
     554   $(VBOX_AUDIO_PATH_SOURCES)/AudioMixBuffer.cpp \
     555   $(VBOX_AUDIO_PATH_SOURCES)/AudioMixer.cpp \
     556   $(VBOX_AUDIO_PATH_SOURCES)/DrvAudio.cpp \
     557   $(VBOX_AUDIO_PATH_SOURCES)/DrvAudioCommon.cpp \
     558   $(VBOX_AUDIO_PATH_SOURCES)/DrvHostNullAudio.cpp
    557559
    558560 ifeq ($(KBUILD_TARGET),darwin)
    559561  VBoxDD_SOURCES += \
    560    Audio/DrvHostCoreAudio.cpp
     562   $(VBOX_AUDIO_PATH_SOURCES)/DrvHostCoreAudio.cpp
    561563 endif
    562564
    563565 ifeq ($(KBUILD_TARGET),win)
    564566  VBoxDD_SOURCES += \
    565    Audio/DrvHostDSound.cpp
     567   $(VBOX_AUDIO_PATH_SOURCES)/DrvHostDSound.cpp
    566568 endif
    567569
    … …  
    570572   VBoxDD_DEFS    += VBOX_WITH_OSS
    571573   VBoxDD_SOURCES += \
    572         Audio/DrvHostOSSAudio.cpp
     574        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostOSSAudio.cpp
    573575  endif
    574576
    … …  
    576578   VBoxDD_DEFS    += VBOX_WITH_PULSE
    577579   VBoxDD_SOURCES += \
    578    Audio/DrvHostPulseAudio.cpp \
    579    Audio/pulse_stubs.c
     580   $(VBOX_AUDIO_PATH_SOURCES)/DrvHostPulseAudio.cpp \
     581   $(VBOX_AUDIO_PATH_SOURCES)/pulse_stubs.c
    580582  endif
    581583
    … …  
    583585   VBoxDD_DEFS    += VBOX_WITH_ALSA
    584586   VBoxDD_SOURCES += \
    585         Audio/DrvHostALSAAudio.cpp \
    586         Audio/alsa_stubs.c
     587        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostALSAAudio.cpp \
     588        $(VBOX_AUDIO_PATH_SOURCES)/alsa_stubs.c
    587589  endif
    588590 endif
    … …  
    592594   VBoxDD_DEFS    += VBOX_WITH_OSS
    593595   VBoxDD_SOURCES += \
    594         Audio/DrvHostOSSAudio.cpp
     596        $(VBOX_AUDIO_PATH_SOURCES)/DrvHostOSSAudio.cpp
    595597  endif
    596598  ifdef VBOX_WITH_PULSE
    597599   VBoxDD_DEFS    += VBOX_WITH_PULSE
    598600   VBoxDD_SOURCES += \
    599    Audio/DrvHostPulseAudio.cpp \
    600    Audio/pulse_stubs.c
     601   $(VBOX_AUDIO_PATH_SOURCES)/DrvHostPulseAudio.cpp \
     602   $(VBOX_AUDIO_PATH_SOURCES)/pulse_stubs.c
    601603  endif
    602604 endif
    … …  
    604606 ifeq ($(KBUILD_TARGET),solaris)
    605607  ifdef VBOX_WITH_OSS
    606    VBoxDD_SOURCES += Audio/DrvHostOSSAudio.cpp
     608   VBoxDD_SOURCES += $(VBOX_AUDIO_PATH_SOURCES)/DrvHostOSSAudio.cpp
    607609   VBoxDD_DEFS    += VBOX_WITH_OSS
    608610  endif

  • trunk/src/VBox/Main/Makefile.kmk

    r61332 r61413  
    777777        src-client/VMMDevInterface.cpp \
    778778        $(VBOX_AUTOGEN_EVENT_CPP) \
    779         $(VBOX_XML_SCHEMADEFS_CPP) \
    780         ../Devices/Audio/AudioMixBuffer.cpp \
    781         ../Devices/Audio/DrvAudioCommon.cpp \
    782     $(if $(VBOX_WITH_VRDE_AUDIO),src-client/DrvAudioVRDE.cpp,)
     779        $(VBOX_XML_SCHEMADEFS_CPP)
     780
     781# Audio bits.
     782VBoxC_DEFS    += \
     783    $(if $(VBOX_WITH_AUDIO_STABLE), VBOX_WITH_AUDIO_STABLE,)
     784
     785VBoxC_SOURCES += \
     786        ../Devices/$(VBOX_AUDIO_PATH_SOURCES)/AudioMixBuffer.cpp \
     787        ../Devices/$(VBOX_AUDIO_PATH_SOURCES)/DrvAudioCommon.cpp \
     788    $(if $(VBOX_WITH_VRDE_AUDIO),src-client/DrvAudioVRDE$(VBOX_AUDIO_FILE_SUFFIX).cpp,)
    783789
    784790VBoxC_SOURCES.win = \
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette