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

Merge branch 'big_2017_api_change' of https://git.rwth-aachen.de/ita/VACore...

Merge branch 'big_2017_api_change' of https://git.rwth-aachen.de/ita/VACore into big_2017_api_change
parents 7a34309e 39acb04c
......@@ -4030,6 +4030,7 @@ void CVACoreImpl::InitializeAudioRenderers()
CVAAudioRendererDesc oRendererDesc( pRenderer );
oRendererDesc.sID = sID;
oRendererDesc.sClass = sClass;
oRendererDesc.bEnabled = bEnabled;
ITADatasource* pRendererOutputTail = pRenderer->GetOutputDatasource();;
if( oParams.bRecordOutputEnabled )
......@@ -4169,6 +4170,7 @@ void CVACoreImpl::InitializeReproductionModules()
oDesc.sID = oParams.sID;
oDesc.sClass = oParams.sClass;
oDesc.vpOutputs = oParams.vpOutputs;
oDesc.bEnabled = bEnabled;
// Add output in Renderer-to-Reproduction patch bay
int iReproductionModuleNumInputChannels = oDesc.pInstance->GetNumInputChannels();
......@@ -4850,6 +4852,10 @@ void CVACoreImpl::GetRenderingModules( std::vector< CVAAudioRendererInfo >& vRen
oRendererInfo.sID = oRenderer.sID;
oRendererInfo.sClass = oRenderer.sClass;
oRendererInfo.sDescription = oRendererInfo.sDescription;
oRendererInfo.bEnabled = oRenderer.bEnabled;
oRendererInfo.bOutputDetectorEnabled = oRenderer.bOutputDetectorEnabled;
oRendererInfo.oParams = oRenderer.oParams;
oRendererInfo.sOutputRecordingFilePath = oRenderer.sOutputRecordingFilePath;
if( !bFilterEnabled || oRendererInfo.bEnabled )
vRenderers.push_back( oRendererInfo );
}
......@@ -4894,6 +4900,12 @@ void CVACoreImpl::GetReproductionModules( std::vector< CVAAudioReproductionInfo
oRepInfo.sID = oRepro.sID;
oRepInfo.sClass = oRepro.sClass;
oRepInfo.sDescription = oRepro.sDescription;
oRepInfo.bEnabled = oRepro.bEnabled;
oRepInfo.bInputDetectorEnabled = oRepro.bInputDetectorEnabled;
oRepInfo.sInputRecordingFilePath = oRepro.sInputRecordingFilePath;
oRepInfo.bOutputDetectorEnabled = oRepro.bOutputDetectorEnabled;
oRepInfo.sOutputRecordingFilePath = oRepro.sOutputRecordingFilePath;
oRepInfo.oParams = oRepro.oParams;
if( !bFilterEnabled || oRepInfo.bEnabled )
vRepros.push_back( oRepInfo );
}
......
......@@ -372,7 +372,7 @@ private:
};
std::vector< CVAAudioRendererDesc > m_voRenderers;
class CVAAudioReproductionModuleDesc : public CVAAudioRendererInfo
class CVAAudioReproductionModuleDesc : public CVAAudioReproductionInfo
{
public:
IVAAudioReproductionModule* pInstance;
......
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