Commit da5fc6cd authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Subwoofer reproduction (mixing all channels or a certain list of channels from rendering module)

parent d6bcc6ae
......@@ -151,6 +151,10 @@ endif( NOT DEFINED ITA_VACORE_WITH_REPRODUCTION_BINAURAL_MIXDOWN )
if( NOT DEFINED ITA_VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN )
set( ITA_VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN OFF CACHE BOOL "Build VACore with reproduction module: ambisonics binaural mixdown (B-format decoder)" )
endif( NOT DEFINED ITA_VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN )
if( NOT DEFINED ITA_VACORE_WITH_REPRODUCTION_MIXER_LOW_FREQUENCY )
set( ITA_VACORE_WITH_REPRODUCTION_MIXER_LOW_FREQUENCY ON CACHE BOOL "Build VACore with reproduction module: low frequency (subwoofer) mixer" )
endif( NOT DEFINED ITA_VACORE_WITH_REPRODUCTION_MIXER_LOW_FREQUENCY )
# Including the source files of all source subfolders recursively
......@@ -258,6 +262,9 @@ endif()
if( ${ITA_VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN} )
add_definitions( "-DVACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN=1" )
endif()
if( ${ITA_VACORE_WITH_REPRODUCTION_MIXER_LOW_FREQUENCY} )
add_definitions( "-DVACORE_WITH_REPRODUCTION_MIXER_LOW_FREQUENCY=1" )
endif()
string( TIMESTAMP VACORE_CMAKE_DATE "%Y-%m-%d" )
add_definitions( "-DVACORE_CMAKE_DATE=\"${VACORE_CMAKE_DATE}\"" )
......
......@@ -223,6 +223,13 @@ Enabled = true
Name = Generic talkthrough to output group
Outputs = MyDesktopHP
[Reproduction:MySubwooferMixer]
Class = LowFrequencyMixer
Enabled = false
Name = Generic low frequency (subwoofer) loudspeaker mixer
Outputs = Cave_SW
MixingChannel = ALL
[Reproduction:MyHD600]
Class = Headphones
Enabled = false
......
......@@ -6,6 +6,7 @@
#include "Binaural/VAHeadphonesReproduction.h"
#include "Binaural/VANCTCReproduction.h"
#include "Talkthrough/VAReproductionTalkthrough.h"
#include "Mixer/VAReproductionLowFrequencyMixer.h"
#include "../VALog.h"
......@@ -61,18 +62,23 @@ void CVAAudioReproductionModuleRegistry::RegisterInternalCoreFactoryMethods()
#endif // ( VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN == 1 )
#if ( VACORE_WITH_REPRODUCTION_BINAURAL_MIXDOWN == 1 )
RegisterReproductionDefaultFactory< CVABinauralMixdownReproduction >( "BinauralMixdown" );
#endif // ( VACORE_WITH_REPRODUCTION_BINAURAL_MIXDOWN == 1 )
#endif
#if ( VACORE_WITH_REPRODUCTION_HEADPHONES == 1 )
RegisterReproductionDefaultFactory< CVAHeadphonesReproduction >( "Headphones" );
#endif // ( VACORE_WITH_REPRODUCTION_HEADPHONES == 1 )
#endif
#if ( VACORE_WITH_REPRODUCTION_BINAURAL_NCTC == 1 )
RegisterReproductionDefaultFactory< CVANCTCReproduction >( "NCTC" );
#endif // ( VACORE_WITH_REPRODUCTION_BINAURAL_NCTC == 1 )
#endif
// Talkthrough
#if ( VACORE_WITH_REPRODUCTION_TALKTHROUGH == 1 )
RegisterReproductionDefaultFactory< CVAReproductionTalkthrough >( "Talkthrough" );
#endif // ( VACORE_WITH_REPRODUCTION_TALKTHROUGH == 1 )
#endif
// Mixer
#if ( VACORE_WITH_REPRODUCTION_MIXER_LOW_FREQUENCY == 1 )
RegisterReproductionDefaultFactory< CVAReproductionLowFrequencyMixer >( "LowFrequencyMixer" );
#endif
m_bInternalCoreFactoriesRegistered = true;
}
......@@ -2,7 +2,7 @@
set( RelativeDir "src/Reproduction" )
set( RelativeSourceGroup "Source Files\\Reproduction" )
set( SubDirs Ambisonics Binaural Talkthrough )
set( SubDirs Ambisonics Binaural Talkthrough Mixer )
set( DirFiles
VAAudioReproductionModule.h
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment