Merge branch 'ma_2018/moesch' of https://git.rwth-aachen.de/ita/VACore into ma_2018/moesch

src/Rendering/Prototyping/GenericPath/VAPTGenericPathAudioRenderer.cpp

@@ -739,7 +739,7 @@ void CVAPTGenericPathAudioRenderer::UpdateGenericSoundPath( int iListenerID, int
 
 	if( sbIR.length() > m_iIRFilterLengthSamples )
 		VA_WARN( "PTGenericPathAudioRenderer", "Filter length for generic sound path channel too long, cropping." );
-	
+
 	std::list< CVAPTGenericSoundPath* >::const_iterator spcit = m_lSoundPaths.begin();
 	while( spcit != m_lSoundPaths.end() )
 	{
@@ -924,7 +924,10 @@ void CVAPTGenericPathAudioRenderer::SetParameters( const CVAStruct& oArgs )
 {
 	// Update
 	if( oArgs.HasKey( "receiver" ) == false || oArgs.HasKey( "source" ) == false )
-		VA_EXCEPT2( INVALID_PARAMETER, "PrototypeGenericPath filter update requires a receiver and a source identifier" );
+	{
+		VA_INFO( "PrototypeGenericPath", "Parameter setter was called without source or receiver id, did not update any generic path filter" );
+		return;
+	}
 
 	int iReceiverID = oArgs[ "receiver" ];
 	int iSourceID = oArgs[ "source" ];

src/core/rendering.cpp

@@ -99,7 +99,8 @@ void CVACoreImpl::GetRenderingModules( std::vector< CVAAudioRendererInfo >& vRen
 		oRendererInfo.bEnabled = oRenderer.bEnabled;
 		oRendererInfo.bOutputDetectorEnabled = oRenderer.bOutputDetectorEnabled;
 		oRendererInfo.oParams = oRenderer.oParams;
-		oRendererInfo.sOutputRecordingFilePath = oRenderer.pOutputRecorder->GetFilePath();
+		if( oRenderer.pOutputRecorder )
+			oRendererInfo.sOutputRecordingFilePath = oRenderer.pOutputRecorder->GetFilePath();
 		if( !bFilterEnabled || oRendererInfo.bEnabled )
 			vRenderers.push_back( oRendererInfo );
 	}

src/core/reproduction.cpp

@@ -136,8 +136,10 @@ void CVACoreImpl::GetReproductionModules( std::vector< CVAAudioReproductionInfo
 		oRepInfo.sDescription = oRepro.sDescription;
 		oRepInfo.bEnabled = oRepro.bEnabled;
 		oRepInfo.bInputDetectorEnabled = oRepro.bInputDetectorEnabled;
-		oRepInfo.sInputRecordingFilePath = oRepro.pInputRecorder->GetFilePath();
+		if( oRepro.pInputRecorder )
+			oRepInfo.sInputRecordingFilePath = oRepro.pInputRecorder->GetFilePath();
 		oRepInfo.bOutputDetectorEnabled = oRepro.bOutputDetectorEnabled;
+		if( oRepro.pOutputRecorder )
 		oRepInfo.sOutputRecordingFilePath = oRepro.pOutputRecorder->GetFilePath();
 		oRepInfo.oParams = oRepro.oParams;
 		if( !bFilterEnabled || oRepInfo.bEnabled )