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

Renaming configured 'outputs' of rendering modules to 'reproductions'

parent b384c8e3
...@@ -128,7 +128,7 @@ DefaultShiftSpeed = 0.0, 0.0, 0.0 # 3D vector in m/s ...@@ -128,7 +128,7 @@ DefaultShiftSpeed = 0.0, 0.0, 0.0 # 3D vector in m/s
[Renderer:MyBinauralFreeField] [Renderer:MyBinauralFreeField]
Enabled = true Enabled = true
Class = BinauralFreeField Class = BinauralFreeField
Outputs = MyTalkthroughHeadphones Reproductions = MyTalkthroughHeadphones
OutputDetectorEnabled = false OutputDetectorEnabled = false
RecordOutputEnabled = false RecordOutputEnabled = false
RecordOutputFilePath = $(ProjectName)_Renderer_MyBinauralFreeField_Output.wav RecordOutputFilePath = $(ProjectName)_Renderer_MyBinauralFreeField_Output.wav
...@@ -147,12 +147,12 @@ class = AmbientMixer ...@@ -147,12 +147,12 @@ class = AmbientMixer
Description = Low-cost renderer to make sound audible without spatializations Description = Low-cost renderer to make sound audible without spatializations
Enabled = false Enabled = false
OutputGroup = MyDesktopHP OutputGroup = MyDesktopHP
Outputs = MyTalkthroughHeadphones Reproductions = MyTalkthroughHeadphones
[Renderer:MyBinauralArtificialReverb] [Renderer:MyBinauralArtificialReverb]
Class = BinauralArtificialReverb Class = BinauralArtificialReverb
Enabled = false Enabled = false
Outputs = MyTalkthroughHeadphones Reproductions = MyTalkthroughHeadphones
ReverberationTime = 0.71 ReverberationTime = 0.71
RoomVolume = 200 RoomVolume = 200
RoomSurfaceArea = 88 RoomSurfaceArea = 88
...@@ -167,7 +167,7 @@ ScatteringCoefficient = 0.1 ...@@ -167,7 +167,7 @@ ScatteringCoefficient = 0.1
[Renderer:MyBinauralRoomAcoustics] [Renderer:MyBinauralRoomAcoustics]
Class = BinauralRoomAcoustics Class = BinauralRoomAcoustics
Enabled = false Enabled = false
Outputs = MyTalkthroughHeadphones Reproductions = MyTalkthroughHeadphones
# Setup options: Local, Remote, Hybrid # Setup options: Local, Remote, Hybrid
Setup = Local Setup = Local
ServerIP = PC-SEACEN ServerIP = PC-SEACEN
...@@ -185,7 +185,7 @@ DirectSoundPowerCorrectionFactor = 0.05 ...@@ -185,7 +185,7 @@ DirectSoundPowerCorrectionFactor = 0.05
[Renderer:MyMonauralFreeField] [Renderer:MyMonauralFreeField]
Class = MonauralFreeField Class = MonauralFreeField
Enabled = false Enabled = false
Outputs = MyTalkthroughHeadphones Reproductions = MyTalkthroughHeadphones
MotionModelNumHistoryKeys = 10000 MotionModelNumHistoryKeys = 10000
MotionModelWindowSize = 0.2 MotionModelWindowSize = 0.2
MotionModelWindowDelay = 0.1 MotionModelWindowDelay = 0.1
...@@ -198,8 +198,8 @@ SwitchingAlgorithm = linear ...@@ -198,8 +198,8 @@ SwitchingAlgorithm = linear
[Renderer:MyHearingAidRenderer] [Renderer:MyHearingAidRenderer]
Class = PrototypeHearingAid Class = PrototypeHearingAid
Enabled = false Enabled = false
Outputs = HearingAidTalkthrough Reproductions = HearingAidTalkthrough
#Outputs = MyTalkthroughHeadphones #Reproductions = MyTalkthroughHeadphones
UpdateRateDS = 120.0 UpdateRateDS = 120.0
UpdateRateIS = 20.0 UpdateRateIS = 20.0
UpdateRateRT = 1.0 UpdateRateRT = 1.0
...@@ -214,7 +214,7 @@ DumpListenersGain = 10 ...@@ -214,7 +214,7 @@ DumpListenersGain = 10
[Renderer:MyGenericRenderer] [Renderer:MyGenericRenderer]
Class = PrototypeGenericPath Class = PrototypeGenericPath
Enabled = false Enabled = false
Outputs = MyTalkthroughHeadphones Reproductions = MyTalkthroughHeadphones
NumChannels = 2 NumChannels = 2
IRFilterLengthSamples = 88200 IRFilterLengthSamples = 88200
IRFilterDelaySamples = 0 IRFilterDelaySamples = 0
...@@ -223,14 +223,14 @@ OutputMonitoring = true ...@@ -223,14 +223,14 @@ OutputMonitoring = true
[Renderer:MyAirTrafficNoiseRenderer] [Renderer:MyAirTrafficNoiseRenderer]
Class = BinauralAirTrafficNoise Class = BinauralAirTrafficNoise
Enabled = false Enabled = false
Outputs = MyTalkthroughHeadphones Reproductions = MyTalkthroughHeadphones
[Renderer:MyVBAPFreefield] [Renderer:MyVBAPFreefield]
Class = VBAPFreeField Class = VBAPFreeField
Enabled = false Enabled = false
Output = VRLab_Horizontal_LS Output = VRLab_Horizontal_LS
Outputs = MixdownHeadphones Reproductions = MixdownHeadphones
[Renderer:MyDummyRenderer] [Renderer:MyDummyRenderer]
...@@ -238,7 +238,7 @@ class = PrototypeDummy ...@@ -238,7 +238,7 @@ class = PrototypeDummy
Description = Dummy renderer for testing and benchmarking Description = Dummy renderer for testing and benchmarking
Enabled = false Enabled = false
OutputGroup = MyDesktopHP OutputGroup = MyDesktopHP
Outputs = MyTalkthroughHeadphones Reproductions = MyTalkthroughHeadphones
# --= Audio reproduction =-- # --= Audio reproduction =--
......
...@@ -38,7 +38,7 @@ CVAAmbientMixerAudioRenderer::CVAAmbientMixerAudioRenderer( const CVAAudioRender ...@@ -38,7 +38,7 @@ CVAAmbientMixerAudioRenderer::CVAAmbientMixerAudioRenderer( const CVAAudioRender
, m_bIndicateReset( false ) , m_bIndicateReset( false )
, m_bResetAck( false ) , m_bResetAck( false )
{ {
assert( m_oParams.vsOutputs.size() > 0 ); assert( m_oParams.vsReproductions.size() > 0 );
CVAConfigInterpreter conf( *m_oParams.pConfig ); CVAConfigInterpreter conf( *m_oParams.pConfig );
......
...@@ -35,7 +35,7 @@ public: ...@@ -35,7 +35,7 @@ public:
std::string sClass; //!< Renderer class std::string sClass; //!< Renderer class
CVACoreImpl* pCore; //!< Parent core CVACoreImpl* pCore; //!< Parent core
const CVAStruct* pConfig; //!< Renderer configuration const CVAStruct* pConfig; //!< Renderer configuration
std::vector< std::string > vsOutputs; //!< Renderer outputs (e.g. Output:HP, Reproduction:CTC4) std::vector< std::string > vsReproductions; //!< Renderer outputs (e.g. Output:HP, Reproduction:CTC4)
bool bRecordOutputEnabled; //!< Renderer output recording and storing flag bool bRecordOutputEnabled; //!< Renderer output recording and storing flag
std::string sRecordOutputFilePath; //!< Renderer output recording and storing file path std::string sRecordOutputFilePath; //!< Renderer output recording and storing file path
bool bOutputLevelMeterEnabled; //!< Renderer output level meter will be used (uses a little bit CPU resources) bool bOutputLevelMeterEnabled; //!< Renderer output level meter will be used (uses a little bit CPU resources)
......
...@@ -4434,8 +4434,8 @@ void CVACoreImpl::InitializeAudioRenderers() ...@@ -4434,8 +4434,8 @@ void CVACoreImpl::InitializeAudioRenderers()
oParams.pCore = this; oParams.pCore = this;
oParams.pConfig = &cit->second.GetStruct(); oParams.pConfig = &cit->second.GetStruct();
conf.ReqStringListRegex( "Outputs", oParams.vsOutputs, "\\s*,\\s*" ); conf.ReqStringListRegex( "Reproductions", oParams.vsReproductions, "\\s*,\\s*" );
std::unique( oParams.vsOutputs.begin(), oParams.vsOutputs.end() ); std::unique( oParams.vsReproductions.begin(), oParams.vsReproductions.end() );
conf.OptBool( "OutputDetectorEnabled", oParams.bOutputLevelMeterEnabled, false ); conf.OptBool( "OutputDetectorEnabled", oParams.bOutputLevelMeterEnabled, false );
...@@ -4477,9 +4477,9 @@ void CVACoreImpl::InitializeAudioRenderers() ...@@ -4477,9 +4477,9 @@ void CVACoreImpl::InitializeAudioRenderers()
int iInput = m_pR2RPatchbay->AddInput( pRendererOutputTail ); int iInput = m_pR2RPatchbay->AddInput( pRendererOutputTail );
// Create direct output in output patchbay for each output group [todo, not allowed yet] // Create direct output in output patchbay for each output group [todo, not allowed yet]
for( size_t i = 0; i < oParams.vsOutputs.size(); i++ ) for( size_t i = 0; i < oParams.vsReproductions.size(); i++ )
{ {
const std::string& sOutputID( oParams.vsOutputs[ i ] ); const std::string& sOutputID( oParams.vsReproductions[ i ] );
const CVAHardwareOutput* pOutput = m_oCoreConfig.oHardwareSetup.GetOutput( sOutputID ); const CVAHardwareOutput* pOutput = m_oCoreConfig.oHardwareSetup.GetOutput( sOutputID );
if( pOutput ) if( pOutput )
...@@ -4490,7 +4490,7 @@ void CVACoreImpl::InitializeAudioRenderers() ...@@ -4490,7 +4490,7 @@ void CVACoreImpl::InitializeAudioRenderers()
} }
oRendererDesc.iR2RPatchBayInput = iInput; oRendererDesc.iR2RPatchBayInput = iInput;
oRendererDesc.vsOutputs = oParams.vsOutputs; oRendererDesc.vsOutputs = oParams.vsReproductions;
m_voRenderers.push_back( oRendererDesc ); m_voRenderers.push_back( oRendererDesc );
} }
} }
......
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