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

removing build config file and moved all settings to CMake configuration file

parent 32f685c1
......@@ -16,7 +16,7 @@
#include <assert.h>
#include <string>
#if VACORE_RENDERER_AMBIENT_MIXER == 1
#if VACORE_WITH_RENDERER_AMBIENT_MIXER == 1
CVAAmbientMixerAudioRenderer::CVAAmbientMixerAudioRenderer( const CVAAudioRendererInitParams& oParams_ )
: m_oParams( oParams_ )
......@@ -131,4 +131,4 @@ void CVAAmbientMixerAudioRenderer::UpdateScene( CVASceneState* pNewState )
m_pNewSceneState = pNewState;
}
#endif // VACORE_RENDERER_AMBIENT_MIXER
#endif // VACORE_WITH_RENDERER_AMBIENT_MIXER
#include "VAAmbisonicsFreefieldAudioRenderer.h"
#if ( VACORE_RENDERER_AMBISONICS_FREEFIELD == 1 )
#if ( VACORE_WITH_RENDERER_AMBISONICS_FREEFIELD == 1 )
#include "../../../Scene/VAScene.h"
#include "../../../Utils/VAUtils.h"
......@@ -301,4 +301,4 @@ int CVAAmbisonicsFreefieldAudioRenderer::GetIndex(int m, int n)
}
#endif // (VACORE_RENDERER_AMBISONICS_FREEFIELD==1)
#endif // ( VACORE_WITH_RENDERER_AMBISONICS_FREEFIELD == 1 )
// $Id: $
#include "VAAirTrafficNoiseAudioRenderer.h"
#if ( VACORE_RENDERER_BINAURAL_AIR_TRAFFIC_NOISE == 1 )
#if ( VACORE_WITH_RENDERER_BINAURAL_AIR_TRAFFIC_NOISE == 1 )
#include "../../../Filtering/VATemporalVariations.h"
......@@ -1519,4 +1519,4 @@ void CVABATNSoundPath::UpdateHRIR()
#endif // ( VACORE_RENDERER_BINAURAL_AIR_TRAFFIC_NOISE == 1 )
#endif // ( VACORE_WITH_RENDERER_BINAURAL_AIR_TRAFFIC_NOISE == 1 )
// $Id: $
#include "VABinauralArtificialReverb.h"
#if ( VACORE_RENDERER_BINAURAL_ARTIFICIAL_REVERB == 1 )
#if ( VACORE_WITH_RENDERER_BINAURAL_ARTIFICIAL_REVERB == 1 )
// VA includes
#include "../../../Data/VADirectivity.h"
......@@ -1448,4 +1448,4 @@ void CBARPath::UpdateMetrics()
oRelations.Calc( pSource->vPredPos, pSource->vPredView, pSource->vPredUp, pListener->vPredPos, pListener->vPredView, pListener->vPredUp );
}
#endif // ( VACORE_RENDERER_BINAURAL_ARTIFICIAL_REVERB == 1 )
#endif // ( VACORE_WITH_RENDERER_BINAURAL_ARTIFICIAL_REVERB == 1 )
// $Id: $
#include "VABinauralFreefieldAudioRenderer.h"
#if ( VACORE_RENDERER_BINAURAL_FREEFIELD == 1 )
#if ( VACORE_WITH_RENDERER_BINAURAL_FREEFIELD == 1 )
// VA includes
#include "../../../Data/VADirectivity.h"
......@@ -1384,4 +1384,4 @@ void CVABinauralFreeFieldAudioRenderer::onStopDumpListeners()
m_bDumpListeners = false;
}
#endif // ( VACORE_RENDERER_BINAURAL_FREEFIELD == 1 )
#endif // ( VACORE_WITH_RENDERER_BINAURAL_FREEFIELD == 1 )
......@@ -26,7 +26,7 @@
#include "../../../VACoreBuildConfig.h"
#if( VACORE_RENDERER_BINAURAL_FREEFIELD==1 )
#if( VACORE_WITH_RENDERER_BINAURAL_FREEFIELD==1 )
// VA includes
#include "../../../Filtering/VAVariableDelayLine.h"
......@@ -379,6 +379,6 @@ private:
VA_REGISTER_AUDIO_RENDERER( CVABinauralFreeFieldAudioRenderer, "BinauralFreeField" );
#endif // ( VACORE_RENDERER_BINAURAL_FREEFIELD==1 )
#endif // ( VACORE_WITH_RENDERER_BINAURAL_FREEFIELD==1 )
#endif // __VA_BINAURALFREEFIELDAUDIORENDERER__
......@@ -2,7 +2,7 @@
#include "VARoomAcousticsAudioRenderer.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#include "VARoomAcousticsHybridScheduler.h"
#include "VARoomAcousticsLocalScheduler.h"
......@@ -2737,4 +2737,4 @@ CVAStruct CVARoomAcousticsAudioRenderer::CallObjectConfigGet( const std::string&
return oRet;
}
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
......@@ -27,7 +27,7 @@
#include "../../../VACoreBuildConfig.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
// VA includes
#include <VABaseDefinitions.h>
......@@ -295,7 +295,7 @@ private:
VA_REGISTER_AUDIO_RENDERER( CVARoomAcousticsAudioRenderer, "BinauralRoomAcoustics" );
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // __VA_ROOMACOUSTICSLAUDIORENDERER__
......@@ -2,7 +2,7 @@
#include "VARoomAcousticsAudioRenderer.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#include <ITAConfigUtils.h>
#include <ITAException.h>
......@@ -40,4 +40,4 @@ bool CVARoomAcousticsAudioRendererConfig::ReadFromINIFile( const std::string& sI
return true;
}
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
\ No newline at end of file
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
\ No newline at end of file
......@@ -26,7 +26,7 @@
#include "../../../VACoreBuildConfig.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#include "VARoomAcousticsScheduler.h"
......@@ -40,6 +40,6 @@ public:
};
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // __VA_ROOMACOUSTICSCLUSTERSCHEDULER__
#include "VARoomAcousticsHybridScheduler.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#include "VARoomAcousticsAudioRenderer.h"
#include "VARoomAcousticsScheduler.h"
......@@ -644,4 +644,4 @@ bool CVARavenHybridScheduler::GetProfilerStatus( CProfiler& oStatus )
}
}
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
\ No newline at end of file
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
\ No newline at end of file
......@@ -28,7 +28,7 @@
#include "../../../VACoreBuildConfig.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#include <VA/R_Raven.h>
#include <VA/R_RavenLocalScheduler.h>
......@@ -138,6 +138,6 @@ private:
void ImmediatelyDiscard( CVARoomAcousticsSimulationTask* );
};
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // __VA_ROOMACOUSTICS_HYBRID_SCHEDULER__
#include "VARoomAcousticsLocalScheduler.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#include "VARoomAcousticsAudioRenderer.h"
#include "VARoomAcousticsScheduler.h"
......@@ -108,4 +108,4 @@ int CVARavenLocalScheduler::CallObject( const CVAStruct& oArgs, CVAStruct& oRetu
return ( oReturn.IsEmpty() ? 0 : 1 );
}
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
\ No newline at end of file
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
\ No newline at end of file
......@@ -26,7 +26,7 @@
#include "../../../VACoreBuildConfig.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#include <VA/R_RavenLocalScheduler.h>
......@@ -67,6 +67,6 @@ private:
CVACoreImpl* m_pCore; //!< Zeiger auf erzeugenden VACore
};
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // __VA_ROOMACOUSTICS_LOCAL_SCHEDULER__
#include "VARoomAcousticsRemoteScheduler.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#include "VARoomAcousticsAudioRenderer.h"
#include "VARoomAcousticsScheduler.h"
......@@ -436,4 +436,4 @@ int CVARavenRemoteScheduler::CallObject(const CVAStruct& oArgs, CVAStruct& oRetu
return (oReturn.IsEmpty() ? 0 : 1);
}
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
\ No newline at end of file
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
\ No newline at end of file
......@@ -26,7 +26,7 @@
#include "../../../VACoreBuildConfig.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#include <VA/R_Raven.h>
......@@ -107,6 +107,6 @@ private:
void FilterAndReplaceTasks( TaskList& , CVARoomAcousticsSimulationTask* );
};
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // __VA_ROOMACOUSTICS_REMOTE_SCHEDULER__
......@@ -26,7 +26,7 @@
#include "../VACoreBuildConfig.h"
#if (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#if (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#include <VAObjectPool.h>
......@@ -75,6 +75,6 @@ public:
virtual CVARoomAcousticsSimulationTask* CreateTask()=0;
};
#endif // (VACORE_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // (VACORE_WITH_RENDERER_BINAURAL_ROOM_ACOUSTICS==1)
#endif // __VA_ROOMACOUSTICSSCHEDULER__
// $Id: $
#include "VAMonauralFreefieldAudioRenderer.h"
#if( VACORE_RENDERER_MONAURAL_FREEFIELD==1 )
#if( VACORE_WITH_RENDERER_MONAURAL_FREEFIELD==1 )
// VA includes
#include "../../../Data/VADirectivity.h"
......@@ -1144,4 +1144,4 @@ int CVAMonauralFreeFieldAudioRenderer::CallObject( const CVAStruct& oArgs, CVASt
oReturn.Clear();
return -1;
}
#endif // (VACORE_RENDERER_MONAURAL_FREEFIELD==1)
#endif // (VACORE_WITH_RENDERER_MONAURAL_FREEFIELD==1)
......@@ -26,7 +26,7 @@
#include "../../../VACoreBuildConfig.h"
#if( VACORE_RENDERER_MONAURAL_FREEFIELD==1 )
#if( VACORE_WITH_RENDERER_MONAURAL_FREEFIELD==1 )
// VA includes
#include "../../../Filtering/VAVariableDelayLine.h"
......@@ -351,6 +351,6 @@ private:
VA_REGISTER_AUDIO_RENDERER( CVAMonauralFreeFieldAudioRenderer, "MonauralFreeField" );
#endif // ( VACORE_RENDERER_MONAURAL_FREEFIELD==1 )
#endif // ( VACORE_WITH_RENDERER_MONAURAL_FREEFIELD==1 )
#endif // __VA_MONAURALFREEFIELDAUDIORENDERER__
......@@ -5,7 +5,7 @@
#include "../../../VACoreImpl.h"
#include "../../../VAHardwareSetup.h"
#if VACORE_RENDERER_PROTOTYPE_DUMMY == 1
#if VACORE_WITH_RENDERER_PROTOTYPE_DUMMY == 1
CVAPTDummyAudioRenderer::CVAPTDummyAudioRenderer( const CVAAudioRendererInitParams& oParams )
{
......@@ -39,4 +39,4 @@ void CVAPTDummyAudioRenderer::HandleProcessStream( ITADatasourceRealization*, co
m_pDataSource->IncrementWritePointer();
}
#endif // VACORE_RENDERER_PROTOTYPE_DUMMY
#endif // VACORE_WITH_RENDERER_PROTOTYPE_DUMMY
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