Commit a966ab23 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 f89ab1b2 653e3833
...@@ -3765,12 +3765,10 @@ std::string CVACoreImpl::CreateScene( const CVAStruct& oParams, const std::strin ...@@ -3765,12 +3765,10 @@ std::string CVACoreImpl::CreateScene( const CVAStruct& oParams, const std::strin
std::string sDestFilename = correctPath( m_oCoreConfig.mMacros.SubstituteMacros( sFilePath ) ); std::string sDestFilename = correctPath( m_oCoreConfig.mMacros.SubstituteMacros( sFilePath ) );
for( std::vector<CVAAudioRendererDesc>::iterator it = m_voRenderers.begin(); it != m_voRenderers.end(); ++it ) for( std::vector<CVAAudioRendererDesc>::iterator it = m_voRenderers.begin(); it != m_voRenderers.end(); ++it )
it->pInstance->LoadScene( sDestFilename ); it->pInstance->LoadScene( sDestFilename );
return "not_implemented";
} }
else else
{ {
VA_EXCEPT2( INVALID_PARAMETER, "Could not interpret scene parameters" ); VA_EXCEPT2( INVALID_PARAMETER, "Could not interpret scene parameters, missing key 'filepath'" );
} }
} }
VA_RETHROW; VA_RETHROW;
...@@ -3852,7 +3850,6 @@ std::string CVACoreImpl::GetSoundPortalName( const int iPortalID ) const ...@@ -3852,7 +3850,6 @@ std::string CVACoreImpl::GetSoundPortalName( const int iPortalID ) const
VA_TRY VA_TRY
{ {
// TODO: Was wenn ID ungltig?
return m_pSceneManager->GetPortalName( iPortalID ); return m_pSceneManager->GetPortalName( iPortalID );
} }
VA_RETHROW; VA_RETHROW;
...@@ -3980,9 +3977,6 @@ bool CVACoreImpl::GetInputMuted() const ...@@ -3980,9 +3977,6 @@ bool CVACoreImpl::GetInputMuted() const
VA_CHECK_INITIALIZED; VA_CHECK_INITIALIZED;
return m_bInputMuted; return m_bInputMuted;
// TODO: Implement
return false;
} }
void CVACoreImpl::SetInputMuted( const bool bMuted ) void CVACoreImpl::SetInputMuted( const bool bMuted )
...@@ -4000,7 +3994,7 @@ void CVACoreImpl::SetInputMuted( const bool bMuted ) ...@@ -4000,7 +3994,7 @@ void CVACoreImpl::SetInputMuted( const bool bMuted )
if( m_pInputAmp ) if( m_pInputAmp )
{ {
if( m_bInputMuted ) if( m_bInputMuted )
m_pInputAmp->SetGain( 0 ); m_pInputAmp->SetGain( 0.0f );
else else
m_pInputAmp->SetGain( ( float ) m_dInputGain ); m_pInputAmp->SetGain( ( float ) m_dInputGain );
} }
...@@ -4063,11 +4057,7 @@ double CVACoreImpl::GetOutputGain() const ...@@ -4063,11 +4057,7 @@ double CVACoreImpl::GetOutputGain() const
VA_NO_REENTRANCE; VA_NO_REENTRANCE;
VA_CHECK_INITIALIZED; VA_CHECK_INITIALIZED;
VA_TRY return m_dOutputGain;
{
return m_dOutputGain;
}
VA_RETHROW;
} }
void CVACoreImpl::SetOutputGain( const double dGain ) void CVACoreImpl::SetOutputGain( const double dGain )
...@@ -4086,7 +4076,7 @@ void CVACoreImpl::SetOutputGain( const double dGain ) ...@@ -4086,7 +4076,7 @@ void CVACoreImpl::SetOutputGain( const double dGain )
if( m_pOutputPatchbay ) if( m_pOutputPatchbay )
{ {
if( m_bOutputMuted ) if( m_bOutputMuted )
m_pOutputPatchbay->SetOutputGain( 0, 0 ); m_pOutputPatchbay->SetOutputGain( 0, 0.0f );
else else
m_pOutputPatchbay->SetOutputGain( 0, dGain ); m_pOutputPatchbay->SetOutputGain( 0, dGain );
} }
...@@ -4110,9 +4100,6 @@ bool CVACoreImpl::GetOutputMuted() const ...@@ -4110,9 +4100,6 @@ bool CVACoreImpl::GetOutputMuted() const
VA_CHECK_INITIALIZED; VA_CHECK_INITIALIZED;
return m_bOutputMuted; return m_bOutputMuted;
// TODO: Implement
return false;
} }
void CVACoreImpl::SetOutputMuted( const bool bMuted ) void CVACoreImpl::SetOutputMuted( const bool bMuted )
......
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