Changing ITAExceptions to VAExceptions in core

parent 4918ecac
......@@ -125,7 +125,7 @@ std::string CVAAudioSignalSourceManager::RegisterSignalSource( IVAAudioSignalSou
{
// Quelle darf nicht bei einem anderen Kernel registriert sein
if( ( pSource->GetAssociatedCore() != nullptr ) && ( pSource->GetAssociatedCore() != m_pParentCore ) )
ITA_EXCEPT1( INVALID_PARAMETER, "Audio signal already registered by another core instance" );
VA_EXCEPT2( INVALID_PARAMETER, "Audio signal already registered by another core instance" );
m_csSignalSourceAccess.enter();
......@@ -133,7 +133,7 @@ std::string CVAAudioSignalSourceManager::RegisterSignalSource( IVAAudioSignalSou
if( FindSignalSource( pSource ) != m_mSignalSources.end() )
{
m_csSignalSourceAccess.leave();
ITA_EXCEPT1( INVALID_PARAMETER, "Audio signal source already contained" );
VA_EXCEPT2( INVALID_PARAMETER, "Audio signal source already contained" );
}
// Neue ID (Mnemonic + Zahl) generieren
......@@ -224,7 +224,7 @@ std::string CVAAudioSignalSourceManager::GetAudioDeviceInputSignalSource( int iI
{
// Parameter prfen
if( ( iInput < 0 ) || ( iInput > m_iDeviceInputs ) )
ITA_EXCEPT1( INVALID_PARAMETER, "Audio device input index out of range" );
VA_EXCEPT2( INVALID_PARAMETER, "Audio device input index out of range" );
return m_vsDeviceInputSourceIDs[ iInput ];
}
......@@ -343,7 +343,7 @@ CVASignalSourceInfo CVAAudioSignalSourceManager::GetSignalSourceInfo( const std:
if( it == m_mSignalSources.end() )
{
m_csSignalSourceAccess.leave();
ITA_EXCEPT1( INVALID_PARAMETER, "Could not get information on " + sID + ", audio signal source not found" );
VA_EXCEPT2( INVALID_PARAMETER, "Could not get information on " + sID + ", audio signal source not found" );
}
// Informationen zusammenstellen#
......
......@@ -404,7 +404,7 @@ void CVAMachineSignalSource::SetParameters( const CVAStruct& oParams )
{
pStruct = oParams.GetValue( "VALUE" );
if( pStruct->GetDatatype() != CVAStructValue::STRING )
ITA_EXCEPT1( INVALID_PARAMETER, "File path has to be a string" );
VA_EXCEPT2( INVALID_PARAMETER, "File path has to be a string" );
const std::string& sPathRaw = *pStruct;
std::string sPath = m_oConfig.pCore->SubstituteMacros( sPathRaw );
......@@ -414,7 +414,7 @@ void CVAMachineSignalSource::SetParameters( const CVAStruct& oParams )
{
pStruct = oParams.GetValue( "VALUE" );
if( pStruct->GetDatatype() != CVAStructValue::STRING )
ITA_EXCEPT1( INVALID_PARAMETER, "File path has to be a string" );
VA_EXCEPT2( INVALID_PARAMETER, "File path has to be a string" );
const std::string& sPathRaw = *pStruct;
std::string sPath = m_oConfig.pCore->SubstituteMacros( sPathRaw );
......@@ -424,7 +424,7 @@ void CVAMachineSignalSource::SetParameters( const CVAStruct& oParams )
{
pStruct = oParams.GetValue( "VALUE" );
if( pStruct->GetDatatype() != CVAStructValue::STRING )
ITA_EXCEPT1( INVALID_PARAMETER, "File path has to be a string" );
VA_EXCEPT2( INVALID_PARAMETER, "File path has to be a string" );
const std::string& sPathRaw = *pStruct;
std::string sPath = m_oConfig.pCore->SubstituteMacros( sPathRaw );
......
......@@ -135,7 +135,7 @@ public:
CVAPTGenericSoundPath::CVAPTGenericSoundPath( double dSamplerate, int iBlocklength, int iNumChannels, int iIRFilterLength )
{
if( iNumChannels < 1 )
ITA_EXCEPT1( INVALID_PARAMETER, "Number of channels must be positive" );
VA_EXCEPT2( INVALID_PARAMETER, "Number of channels must be positive" );
const int iAlgorithm = CITAVariableDelayLine::CUBIC_SPLINE_INTERPOLATION;
pVariableDelayLine = new CITAVariableDelayLine( dSamplerate, iBlocklength, 6 * dSamplerate, iAlgorithm );
......@@ -214,7 +214,7 @@ void CVAPTGenericPathAudioRenderer::Init( const CVAStruct& oArgs )
conf.OptInteger( "IRFilterLengthSamples", m_iIRFilterLengthSamples, 1024 );
if( m_iIRFilterLengthSamples < 0 )
ITA_EXCEPT1( INVALID_PARAMETER, "IR filter size must be positive" );
VA_EXCEPT2( INVALID_PARAMETER, "IR filter size must be positive" );
conf.OptBool( "OutputMonitoring", m_bOutputMonitoring, false );
......@@ -655,14 +655,14 @@ void CVAPTGenericPathAudioRenderer::UpdateGenericSoundPath( int iListenerID, int
{
ITASampleFrame sfIR( sIRFilePath );
if( sfIR.channels() != m_pOutput->GetNumberOfChannels() )
ITA_EXCEPT1( INVALID_PARAMETER, "Filter has mismatching channels" );
VA_EXCEPT2( INVALID_PARAMETER, "Filter has mismatching channels" );
UpdateGenericSoundPath( iListenerID, iSourceID, sfIR );
}
void CVAPTGenericPathAudioRenderer::UpdateGenericSoundPath( int iListenerID, int iSourceID, int iChannelIndex, const std::string& sIRFilePath )
{
if( iChannelIndex >= m_iNumChannels || iChannelIndex < 0 )
ITA_EXCEPT1( INVALID_PARAMETER, "Requested filter channel greater than output channels or smaller than 1, can not update." );
VA_EXCEPT2( INVALID_PARAMETER, "Requested filter channel greater than output channels or smaller than 1, can not update." );
ITASampleFrame sfIR( sIRFilePath );
if( sfIR.channels() != 1 )
......
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