Changeset 62576 in vbox

Timestamp:

Jul 27, 2016 9:21:44 AM (8 years ago)

Author:

vboxsync

Message:

Audio: Removed temporary 5.0 sources again (VBOX_WITH_AUDIO_50).

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• include/VBox/vmm/pdmaudioifs.h (modified) (2 diffs)
• src/VBox/Devices/Audio_old (deleted)
• src/VBox/Devices/Makefile.kmk (modified) (3 diffs)
• src/VBox/Devices/testcase/Makefile.kmk (modified) (1 diff)
• src/VBox/Devices/testcase/tstDeviceStructSize.cpp (modified) (1 diff)
• src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (modified) (6 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -693 +693 @@
 # 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)
@@ -1163 +1161 @@
  VBOX_BRAND_GUI_CUBE_42PX_PNG        := $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_cube_42px.png
  VBOX_BRAND_GUI_VBOX_SVG             := $(PATH_ROOT)/src/VBox/Artwork/OSE/virtualbox.svg
-endif
-
-#
-# Audio: Which code base to use.
-# This can be overriden in LocalConfig.kmk.
-#
-ifdef VBOX_WITH_AUDIO_50
- VBOX_AUDIO_PATH_SOURCES=Audio_old
- VBOX_AUDIO_FILE_SUFFIX=_old
-else
- VBOX_AUDIO_PATH_SOURCES=Audio
- VBOX_AUDIO_FILE_SUFFIX=
 endif
 

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -35 +35 @@
 # include <VBox/vmm/stam.h>
 #endif
-
-#ifdef VBOX_WITH_AUDIO_50
-# undef ___VBox_vmm_pdmaudioifs_h
-# include "pdmaudioifs_old.h"
-#else
 
 /** @defgroup grp_pdm_ifs_audio     PDM Audio Interfaces
@@ -975 +970 @@
 /** @} */
 
-#endif /* VBOX_WITH_AUDIO_50 */
-
 #endif /* !___VBox_vmm_pdmaudioifs_h */
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -537 +537 @@
  endif
 
- VBoxDD_DEFS  += $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,)
-
  VBoxDD_SOURCES         += \
         $(VBOX_AUDIO_PATH_SOURCES)/DevIchAc97.cpp \
@@ -874 +872 @@
         VMMDev/VMMDevTesting.cpp
 
-  VBoxDDRC_DEFS         += $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,)
   VBoxDDRC_SOURCES      += \
         $(VBOX_AUDIO_PATH_SOURCES)/DevIchHda.cpp
@@ -1046 +1043 @@
 
  VBoxDDR0_DEFS          += \
-        $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,) \
         $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
         $(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM,) \

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

@@ -38 +38 @@
         $(if $(VBOX_WITH_NEW_IOAPIC),VBOX_WITH_NEW_IOAPIC,) \
         $(if $(VBOX_WITH_NVME_IMPL),VBOX_WITH_NVME_IMPL,) \
-        $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,) \
         $(if $(VBOX_WITH_PCI_PASSTHROUGH_IMPL),VBOX_WITH_PCI_PASSTHROUGH_IMPL,) \
         $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -120 +120 @@
 #include <VBox/vmm/pdmaudioifs.h>
 
-#ifdef VBOX_WITH_AUDIO_50
-# undef LOG_GROUP
-# include "../Audio_old/DevIchAc97.cpp"
-# undef LOG_GROUP
-# include "../Audio_old/DevIchHda.cpp"
-#else
 # undef LOG_GROUP
 # include "../Audio/DevIchAc97.cpp"
 # undef LOG_GROUP
 # include "../Audio/DevIchHda.cpp"
-#endif
 
 #include <stdio.h>

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -114 +114 @@
 #undef LOG_GROUP
 #include "../PC/DevHPET.cpp"
-#ifdef VBOX_WITH_AUDIO_50
-# undef LOG_GROUP
-# include "../Audio_old/DevIchAc97.cpp"
-# undef LOG_GROUP
-# include "../Audio_old/DevIchHda.cpp"
-#else
 # undef LOG_GROUP
 # include "../Audio/DevIchAc97.cpp"
 # undef LOG_GROUP
 # include "../Audio/DevIchHda.cpp"
-#endif
 #ifdef VBOX_WITH_NVME_IMPL
 # undef LOG_GROUP
@@ -1927 +1920 @@
     GEN_CHECK_OFF(AC97DRIVER, Out);
 
-#ifndef VBOX_WITH_AUDIO_50
     GEN_CHECK_SIZE(HDAMIXERSTREAM);
     GEN_CHECK_OFF(HDAMIXERSTREAM, DestSource);
     GEN_CHECK_OFF(HDAMIXERSTREAM, pMixStrm);
-#endif
 
     GEN_CHECK_SIZE(HDADRIVER);
@@ -1944 +1935 @@
     GEN_CHECK_OFF(HDADRIVER, MicIn);
 #endif
-#ifndef VBOX_WITH_AUDIO_50
     GEN_CHECK_OFF(HDADRIVER, Front);
-#endif
 #ifdef VBOX_WITH_HDA_51_SURROUND
     GEN_CHECK_OFF(HDADRIVER, CenterLFE);
@@ -1969 +1958 @@
 
     GEN_CHECK_SIZE(HDASTREAM);
-#ifndef VBOX_WITH_AUDIO_50
     GEN_CHECK_OFF(HDASTREAM, u8SD);
-#endif
     GEN_CHECK_OFF(HDASTREAM, u64BDLBase);
     GEN_CHECK_OFF(HDASTREAM, u16FMT);
@@ -1986 +1973 @@
     GEN_CHECK_OFF(HDASTATE, MMIOBaseAddr);
     GEN_CHECK_OFF(HDASTATE, au32Regs[0]);
-#ifdef VBOX_WITH_AUDIO_50
-    GEN_CHECK_OFF(HDASTATE, au32Regs[HDA_NREGS]);
-#else
     GEN_CHECK_OFF(HDASTATE, au32Regs[HDA_NUM_REGS]);
     GEN_CHECK_OFF(HDASTATE, aStreams);
     GEN_CHECK_OFF(HDASTATE, aTags);
-#endif
     GEN_CHECK_OFF(HDASTATE, u64CORBBase);
     GEN_CHECK_OFF(HDASTATE, u64RIRBBase);
@@ -2018 +2001 @@
     GEN_CHECK_OFF(HDASTATE, lstDrv);
     GEN_CHECK_OFF(HDASTATE, pMixer);
-#ifndef VBOX_WITH_AUDIO_50
     GEN_CHECK_OFF(HDASTATE, SinkFront);
-#endif
 #ifdef VBOX_WITH_HDA_51_SURROUND
     GEN_CHECK_OFF(HDASTATE, SinkCenterLFE);
     GEN_CHECK_OFF(HDASTATE, SinkRear);
 #endif
-#ifndef VBOX_WITH_AUDIO_50
     GEN_CHECK_OFF(HDASTATE, SinkLineIn);
-#endif
 #ifdef VBOX_WITH_HDA_MIC_IN
     GEN_CHECK_OFF(HDASTATE, SinkMicIn);

trunk/src/VBox/Main/Makefile.kmk

@@ -785 +785 @@
 
 # Audio bits.
-VBoxC_DEFS    += \
-        $(if $(VBOX_WITH_AUDIO_50),VBOX_WITH_AUDIO_50,)
-
 VBoxC_SOURCES += \
         ../Devices/$(VBOX_AUDIO_PATH_SOURCES)/AudioMixBuffer.cpp \