Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
VACore
Commits
0dced4eb
Commit
0dced4eb
authored
Jul 25, 2016
by
Dipl.-Ing. Jonas Stienen
Browse files
removing build config file and moved all settings to CMake configuration file
parent
32f685c1
Changes
32
Hide whitespace changes
Inline
Side-by-side
src/Rendering/Ambient/Mixer/VAAmbientMixerAudioRenderer.cpp
View file @
0dced4eb
...
...
@@ -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
src/Rendering/Ambisonics/Freefield/VAAmbisonicsFreefieldAudioRenderer.cpp
View file @
0dced4eb
#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
)
src/Rendering/Binaural/AirTrafficNoise/VAAirTrafficNoiseAudioRenderer.cpp
View file @
0dced4eb
// $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 )
src/Rendering/Binaural/ArtificialReverb/VABinauralArtificialReverb.cpp
View file @
0dced4eb
// $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 )
src/Rendering/Binaural/FreeField/VABinauralFreeFieldAudioRenderer.cpp
View file @
0dced4eb
// $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 )
src/Rendering/Binaural/FreeField/VABinauralFreefieldAudioRenderer.h
View file @
0dced4eb
...
...
@@ -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__
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsAudioRenderer.cpp
View file @
0dced4eb
...
...
@@ -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)
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsAudioRenderer.h
View file @
0dced4eb
...
...
@@ -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__
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsAudioRendererConfig.cpp
View file @
0dced4eb
...
...
@@ -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
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsClusterScheduler.h
View file @
0dced4eb
...
...
@@ -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__
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsHybridScheduler.cpp
View file @
0dced4eb
#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
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsHybridScheduler.h
View file @
0dced4eb
...
...
@@ -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__
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsLocalScheduler.cpp
View file @
0dced4eb
#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
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsLocalScheduler.h
View file @
0dced4eb
...
...
@@ -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__
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsRemoteScheduler.cpp
View file @
0dced4eb
#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
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsRemoteScheduler.h
View file @
0dced4eb
...
...
@@ -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__
src/Rendering/Binaural/RoomAcoustics/VARoomAcousticsScheduler.h
View file @
0dced4eb
...
...
@@ -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__
src/Rendering/Monaural/FreeField/VAMonauralFreeFieldAudioRenderer.cpp
View file @
0dced4eb
// $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)
src/Rendering/Monaural/FreeField/VAMonauralFreeFieldAudioRenderer.h
View file @
0dced4eb
...
...
@@ -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__
src/Rendering/Prototyping/Dummy/VAPTDummyAudioRenderer.cpp
View file @
0dced4eb
...
...
@@ -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
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment