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

Finalizing preproc refactoring

parent dd8bc9e3
......@@ -29,7 +29,7 @@
#include <assert.h>
#include <string>
#ifdef VACORE_WITH_RENDERER_AMBIENT_MIXER == 1 )
#ifdef VACORE_WITH_RENDERER_AMBIENT_MIXER
CVAAmbientMixerAudioRenderer::CVAAmbientMixerAudioRenderer( const CVAAudioRendererInitParams& oParams_ )
: m_oParams( oParams_ )
......
......@@ -25,7 +25,7 @@
#ifndef IW_VACORE_BINAURALARTIFICIALREVERBDAUDIORENDERER
#define IW_VACORE_BINAURALARTIFICIALREVERBDAUDIORENDERER
#ifdef VACORE_WITH_RENDERER_BINAURAL_ARTIFICIAL_REVERB == 1 )
#ifdef VACORE_WITH_RENDERER_BINAURAL_ARTIFICIAL_REVERB
// VA includes
#include <VA.h>
......@@ -284,6 +284,6 @@ private:
CVABinauralArtificialReverbAudioRenderer operator=( const CVABinauralArtificialReverbAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // ( VACORE_WITH_RENDERER_BINAURAL_ARTIFICIAL_REVERB == 1 )
#endif // VACORE_WITH_RENDERER_BINAURAL_ARTIFICIAL_REVERB
#endif // IW_VACORE_BINAURALARTIFICIALREVERBDAUDIORENDERER
......@@ -18,7 +18,7 @@
#include "../../../VACoreImpl.h"
#include "../../../VAHardwareSetup.h"
#if VACORE_WITH_RENDERER_PROTOTYPE_DUMMY == 1
#ifdef VACORE_WITH_RENDERER_PROTOTYPE_DUMMY
CVAPTDummyAudioRenderer::CVAPTDummyAudioRenderer( const CVAAudioRendererInitParams& oParams )
:oParams( oParams )
......
......@@ -14,7 +14,7 @@
#ifndef IW_VACORE_PT_DUMMY_AUDIO_RENDERER
#define IW_VACORE_PT_DUMMY_AUDIO_RENDERER
#ifdef VACORE_WITH_RENDERER_PROTOTYPE_DUMMY == 1 )
#ifdef VACORE_WITH_RENDERER_PROTOTYPE_DUMMY
// VA includes
#include "../../VAAudioRenderer.h"
......@@ -60,6 +60,6 @@ private:
CVAPTDummyAudioRenderer operator=( const CVAPTDummyAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // ( VACORE_WITH_RENDERER_PROTOTYPE_DUMMY == 1 )
#endif // VACORE_WITH_RENDERER_PROTOTYPE_DUMMY
#endif // IW_VACORE_PT_DUMMY_AUDIO_RENDERER
......@@ -13,7 +13,7 @@
#include "VAPTGenericPathAudioRenderer.h"
#ifdef VACORE_WITH_RENDERER_PROTOTYPE_GENERIC_PATH == 1 )
#ifdef VACORE_WITH_RENDERER_PROTOTYPE_GENERIC_PATH
// VA includes
#include "../../../Scene/VAScene.h"
......@@ -990,4 +990,4 @@ void CVAPTGenericPathAudioRenderer::SetParameters( const CVAStruct& oArgs )
}
}
#endif // ( VACORE_WITH_RENDERER_PROTOTYPE_GENERIC_PATH == 1 )
#endif // VACORE_WITH_RENDERER_PROTOTYPE_GENERIC_PATH
......@@ -188,6 +188,6 @@ private:
CVAPTGenericPathAudioRenderer operator=( const CVAPTGenericPathAudioRenderer & ) { VA_EXCEPT_NOT_IMPLEMENTED; };
};
#endif // ( VACORE_WITH_RENDERER_PROTOTYPE_GENERIC_PATH == 1 )
#endif // VACORE_WITH_RENDERER_PROTOTYPE_GENERIC_PATH
#endif // IW_VACORE_PT_GENERIC_PATH_AUDIO_RENDERER
......@@ -48,7 +48,7 @@ ITADatasource* CVAReproductionTalkthrough::GetOutputDatasource()
return m_pdsOutputDatasource;
}
void CVAReproductionTalkthrough::HandleProcessStream( ITADatasourceRealization* pSender, const ITAStreamInfo* pStreamInfo )
void CVAReproductionTalkthrough::HandleProcessStream( ITADatasourceRealization*, const ITAStreamInfo* pStreamInfo )
{
if( m_pdsInputDatasource == nullptr )
return;
......@@ -65,7 +65,7 @@ void CVAReproductionTalkthrough::HandleProcessStream( ITADatasourceRealization*
return;
}
void CVAReproductionTalkthrough::HandlePostIncrementBlockPointer( ITADatasourceRealization* pSender )
void CVAReproductionTalkthrough::HandlePostIncrementBlockPointer( ITADatasourceRealization* )
{
if( m_pdsInputDatasource == nullptr )
return;
......
......@@ -30,7 +30,7 @@ public:
void SetInputDatasource( ITADatasource* pDatasource);
ITADatasource* GetOutputDatasource();
int GetNumInputChannels() const;
inline void UpdateScene( CVASceneState* pNewState ) {};
inline void UpdateScene( CVASceneState* ) {};
void HandleProcessStream( ITADatasourceRealization* pSender, const ITAStreamInfo* pStreamInfo );
void HandlePostIncrementBlockPointer(ITADatasourceRealization* pSender );
......
......@@ -65,31 +65,31 @@ void CVAAudioReproductionModuleRegistry::RegisterInternalCoreFactoryMethods()
return;
// Ambisonics
#ifdef VACORE_WITH_REPRODUCTION_AMBISONICS == 1 )
#ifdef VACORE_WITH_REPRODUCTION_AMBISONICS
RegisterReproductionDefaultFactory< CVAAmbisonicsReproduction>( "Ambisonics" );
#endif // ( VACORE_WITH_REPRODUCTION_AMBISONICS == 1 )
#endif
// Binaural
#ifdef VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN == 1 )
#ifdef VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN
RegisterReproductionDefaultFactory< CVAAmbisonicsBinauralMixdownReproduction >( "AmbisonicsBinauralMixdown" );
#endif // ( VACORE_WITH_REPRODUCTION_AMBISONICS_BINAURAL_MIXDOWN == 1 )
#if ( VACORE_WITH_REPRODUCTION_BINAURAL_MIXDOWN == 1 )
#endif
#ifdef VACORE_WITH_REPRODUCTION_BINAURAL_MIXDOWN
RegisterReproductionDefaultFactory< CVABinauralMixdownReproduction >( "BinauralMixdown" );
#endif
#if ( VACORE_WITH_REPRODUCTION_HEADPHONES == 1 )
#ifdef VACORE_WITH_REPRODUCTION_HEADPHONES
RegisterReproductionDefaultFactory< CVAHeadphonesReproduction >( "Headphones" );
#endif
#if ( VACORE_WITH_REPRODUCTION_BINAURAL_NCTC == 1 )
#ifdef VACORE_WITH_REPRODUCTION_BINAURAL_NCTC
RegisterReproductionDefaultFactory< CVANCTCReproduction >( "NCTC" );
#endif
// Talkthrough
#if ( VACORE_WITH_REPRODUCTION_TALKTHROUGH == 1 )
#ifdef VACORE_WITH_REPRODUCTION_TALKTHROUGH
RegisterReproductionDefaultFactory< CVAReproductionTalkthrough >( "Talkthrough" );
#endif
// Mixer
#if ( VACORE_WITH_REPRODUCTION_MIXER_LOW_FREQUENCY == 1 )
#ifdef VACORE_WITH_REPRODUCTION_MIXER_LOW_FREQUENCY
RegisterReproductionDefaultFactory< CVAReproductionLowFrequencyMixer >( "LowFrequencyMixer" );
#endif
......
......@@ -49,7 +49,7 @@ void CVACoreEventHandlerRegistry::DetachAllHandlers()
void CVACoreEventHandlerRegistry::BroadcastEvent( const CVAEvent* evCoreEvent )
{
#ifdef VACORE_EVENTS_ENABLED == 1 )
#ifdef VACORE_EVENTS_ENABLED
m_csHandlers.enter();
for( std::set< IVAEventHandler* >::iterator it = m_spHandlers.begin(); it != m_spHandlers.end(); ++it )
( *it )->HandleVAEvent( evCoreEvent );
......
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