WIP

parent 2fb55828
......@@ -1094,8 +1094,6 @@ void CVABinauralFreeFieldAudioRenderer::ResetInternalData()
void CVABinauralFreeFieldAudioRenderer::UpdateSoundPaths()
{
const int iGlobalAuralisationMode = m_iCurGlobalAuralizationMode;
// Check for new data
std::list< CVABFFSoundPath* >::iterator it = m_lSoundPaths.begin();
while( it != m_lSoundPaths.end() )
......@@ -1483,7 +1481,7 @@ CVAStruct CVABinauralFreeFieldAudioRenderer::CallObject( const CVAStruct& oArgs
CVAConfigInterpreter oConfig( oArgs );
std::string sCommandOrg;
oConfig.ReqNonEmptyString( "Command", sCommandOrg );
oConfig.OptString( "Command", sCommandOrg );
std::string sCommand = toUppercase( sCommandOrg );
// Command resolution
......@@ -1502,7 +1500,7 @@ CVAStruct CVABinauralFreeFieldAudioRenderer::CallObject( const CVAStruct& oArgs
return oReturn;
}
VA_EXCEPT2( INVALID_PARAMETER, "Invalid command (\"" + sCommandOrg + "\")" );
return oReturn;
}
void CVABinauralFreeFieldAudioRenderer::SetParameters( const CVAStruct& oParams )
......
......@@ -1368,7 +1368,8 @@ int CVACoreImpl::CreateSoundSource( const std::string& sName )
VA_TRY
{
if( ( VACORE_MAX_NUM_SOUND_SOURCES != 0 ) && m_pNewSceneState )
int iNumSoundSource = VACORE_MAX_NUM_SOUND_SOURCES;
if( ( iNumSoundSource != 0 ) && m_pNewSceneState )
{
int iSourcesRemain = VACORE_MAX_NUM_SOUND_SOURCES - m_pNewSceneState->GetNumSoundSources();
if( iSourcesRemain <= 0 )
......@@ -1430,7 +1431,8 @@ int CVACoreImpl::CreateSoundSourceExplicitRenderer( const std::string& sRenderer
VA_TRY
{
if( ( VACORE_MAX_NUM_SOUND_SOURCES != 0 ) && m_pNewSceneState )
int iNumSoundSource = VACORE_MAX_NUM_SOUND_SOURCES;
if( ( iNumSoundSource != 0 ) && m_pNewSceneState )
{
int iSourcesRemain = VACORE_MAX_NUM_SOUND_SOURCES - m_pNewSceneState->GetNumSoundSources();
if( iSourcesRemain <= 0 )
......@@ -2203,7 +2205,8 @@ int CVACoreImpl::CreateSoundReceiver( const std::string& sName )
VA_TRY
{
if( ( VACORE_MAX_NUM_SOUND_RECEIVERS != 0 ) && m_pNewSceneState )
int iNumSoundReceivers = VACORE_MAX_NUM_SOUND_RECEIVERS;
if( ( iNumSoundReceivers != 0 ) && m_pNewSceneState )
{
const int iListenersRemain = VACORE_MAX_NUM_SOUND_RECEIVERS - m_pNewSceneState->GetNumListeners();
if( iListenersRemain <= 0 )
......@@ -2317,7 +2320,8 @@ int CVACoreImpl::CreateSoundReceiverExplicitRenderer( const std::string& sRender
VA_TRY
{
if( ( VACORE_MAX_NUM_SOUND_RECEIVERS != 0 ) && m_pNewSceneState )
int iNumSoundReceivers = VACORE_MAX_NUM_SOUND_RECEIVERS;
if( ( iNumSoundReceivers != 0 ) && m_pNewSceneState )
{
int iListenersRemain = VACORE_MAX_NUM_SOUND_RECEIVERS - m_pNewSceneState->GetNumListeners();
if( iListenersRemain <= 0 )
......@@ -4627,7 +4631,7 @@ void CVACoreImpl::SendRenderingModuleOutputDetectorsUpdateEvents()
m_pEventManager->BroadcastEvent( ev );
}
}
}
void CVACoreImpl::SendReproductionModuleOIDetectorsUpdateEvents()
{
......@@ -5036,6 +5040,8 @@ void CVACoreImpl::SetReproductionModuleParameters( const std::string& sModuleID,
if( oParams.HasKey( "RecordInputEnabled" ) )
VA_EXCEPT2( INVALID_PARAMETER, "Recording has to be enabled before streaming is active" );
if( oRep.pInputRecorder )
{
VistaFileSystemFile oFilePath( oRep.pInputRecorder->GetFilePath() );
std::string sFileName = oFilePath.GetLocalName();
std::string sBaseFolder = oFilePath.GetParentDirectory();
......@@ -5069,14 +5075,16 @@ void CVACoreImpl::SetReproductionModuleParameters( const std::string& sModuleID,
oRep.pInputRecorder->SetFilePath( oFilePath.GetName() );
}
}
if( oParams.HasKey( "RecordOutputEnabled" ) )
VA_EXCEPT2( INVALID_PARAMETER, "Recording has to be enabled before streaming is active" );
oFilePath.SetName( oRep.pOutputRecorder->GetFilePath() );
sFileName = oFilePath.GetLocalName();
sBaseFolder = oFilePath.GetParentDirectory();
if( oRep.pOutputRecorder )
{
VistaFileSystemFile oFilePath( oRep.pOutputRecorder->GetFilePath() );
std::string sFileName = oFilePath.GetLocalName();
std::string sBaseFolder = oFilePath.GetParentDirectory();
bool bUpdateRecordOutputPath = false;
if( oParams.HasKey( "RecordOutputFileName" ) )
......@@ -5107,6 +5115,7 @@ void CVACoreImpl::SetReproductionModuleParameters( const std::string& sModuleID,
oRep.pOutputRecorder->SetFilePath( oFilePath.GetName() );
}
}
// Propagate parameters
oRep.pInstance->SetParameters( oParams );
......@@ -5163,6 +5172,8 @@ void CVACoreImpl::SetRenderingModuleParameters( const std::string& sModuleID, co
if( oParams.HasKey( "RecordOutputEnabled" ) )
VA_EXCEPT2( INVALID_PARAMETER, "Recording has to be enabled before streaming is active" );
if( oRend.pOutputRecorder ) // If enabled ...
{
VistaFileSystemFile oFilePath( oRend.pOutputRecorder->GetFilePath() );
std::string sFileName = oFilePath.GetLocalName();
std::string sBaseFolder = oFilePath.GetParentDirectory();
......@@ -5196,6 +5207,7 @@ void CVACoreImpl::SetRenderingModuleParameters( const std::string& sModuleID, co
oRend.pOutputRecorder->SetFilePath( oFilePath.GetName() );
}
}
// Propagate parameters
oRend.pInstance->SetParameters( oParams );
......
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