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

Fixing bug in rendering and reproduction recording

parent 73826094
......@@ -120,10 +120,9 @@ Buffersize = AUTO
Enabled = true
Class = BinauralFreeField
Outputs = MyTalkthroughHeadphones
OutputDetectorEnabled = true
OutputDetectorEnabled = false
RecordOutputEnabled = false
RecordOutputFilePath = $(ProjectName)_Renderer_MyBinauralFreeField_Output.wav
HRIRFilterLength = 256
MotionModelNumHistoryKeys = 10000
MotionModelWindowSize = 0.1
......@@ -254,8 +253,8 @@ Class = Talkthrough
Enabled = true
Name = Generic talkthrough to output group
Outputs = MyDesktopHP
InputDetectorEnabled = true
OutputDetectorEnabled = true
InputDetectorEnabled = false
OutputDetectorEnabled = false
RecordInputEnabled = false
RecordInputFilePath = $(ProjectName)_Reproduction_MyTalkthroughHeadphones_Input.wav
RecordOutputEnabled = false
......
......@@ -4109,7 +4109,7 @@ void CVACoreImpl::InitializeAudioRenderers()
conf.ReqStringListRegex( "Outputs", oParams.vsOutputs, "\\s*,\\s*" );
std::unique( oParams.vsOutputs.begin(), oParams.vsOutputs.end() );
conf.OptBool( "OutputLevelMeterEnabled", oParams.bOutputLevelMeterEnabled, false );
conf.OptBool( "OutputDetectorEnabled", oParams.bOutputLevelMeterEnabled, false );
conf.OptBool( "RecordOutputEnabled", oParams.bRecordOutputEnabled, false );
if( oParams.bRecordOutputEnabled )
......@@ -4134,8 +4134,8 @@ void CVACoreImpl::InitializeAudioRenderers()
ITADatasource* pRendererOutputTail = pRenderer->GetOutputDatasource();;
if( oParams.bRecordOutputEnabled )
{
oRendererDesc.pRecorder = new ITAStreamProbe( pRendererOutputTail, oParams.sRecordOutputFilePath );
pRendererOutputTail = oRendererDesc.pRecorder;
oRendererDesc.pOutputRecorder = new ITAStreamProbe( pRendererOutputTail, oParams.sRecordOutputFilePath );
pRendererOutputTail = oRendererDesc.pOutputRecorder;
}
if( oParams.bOutputLevelMeterEnabled )
......@@ -4298,7 +4298,7 @@ void CVACoreImpl::InitializeReproductionModules()
}
if( oParams.bRecordOutputEnabled )
{
oDesc.pOutputRecorder = new ITAStreamProbe( pOutputTail, oParams.sRecordInputInputFilePath );
oDesc.pOutputRecorder = new ITAStreamProbe( pOutputTail, oParams.sRecordOutputInputFilePath );
pOutputTail = oDesc.pOutputRecorder;
}
......
......@@ -16,6 +16,8 @@
#include <ITAAtomicPrimitives.h>
#include <ITACriticalSection.h>
#include <ITAStreamProbe.h>
#include <ITAPeakDetector.h>
#include <VACore.h>
#include <VABaseDefinitions.h>
......@@ -46,12 +48,10 @@ class DAFFContentIR;
class IVAAudioDriverBackend;
class ITAClock;
class ITADatasource;
class ITAPeakDetector;
class ITASoundSampler;
class ITASoundSamplePool;
class ITAStreamAmplifier;
class ITAStreamPatchbay;
class ITAStreamProbe;
// Wwwh ... ugly name clash with WinSDK definition.
#if WIN32
......@@ -361,12 +361,12 @@ private:
IVAAudioRenderer* pInstance;
int iR2RPatchBayInput; //!< Input on the renderer-reproduction patch bay
std::vector< std::string > vsOutputs; //!< Target reproduction modules
ITAStreamProbe* pRecorder; //!< If a non-nullptr recorder is set, it will be deleted on destruction
ITAStreamProbe* pOutputRecorder; //!< If a non-nullptr recorder is set, it will be deleted on destruction
ITAPeakDetector* pOutputDetector; //!< If a non-nullptr detector is set, it will be deleted on destruction
inline CVAAudioRendererDesc( IVAAudioRenderer* pInstance )
: pInstance( pInstance )
, pRecorder( NULL )
, pOutputRecorder( NULL )
, pOutputDetector( NULL )
{
};
......@@ -374,7 +374,7 @@ private:
inline void Finalize()
{
delete pInstance;
delete pRecorder;
delete pOutputRecorder;
delete pOutputDetector;
};
};
......@@ -406,6 +406,7 @@ private:
delete pInstance;
delete pInputDetector;
delete pOutputDetector;
pInputRecorder->GetFilePath();
delete pInputRecorder;
delete pOutputRecorder;
};
......
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