Commit 353a55e4 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Adding methods to create a TTS signal, but raising an exception because not implemented yet

parent 8b278934
......@@ -165,38 +165,38 @@ m_csReentrance.leave()
#define VA_CATCH(EXPR) \
catch (CVAException& e) { \
throw e; \
} catch (ITAException& e) { \
} catch (ITAException& e) { \
throw convert2VAException(e); \
} catch (VistaExceptionBase& e) { \
} catch (VistaExceptionBase& e) { \
throw convert2VAException(e); \
} catch (...) { \
} catch (...) { \
throw getDefaultUnexpectedVAException(); \
} \
} catch (CVAException& EXPR)
} \
} catch (CVAException& EXPR)
#define VA_FINALLY \
catch (CVAException& e) { \
throw e; \
} catch (ITAException& e) { \
} catch (ITAException& e) { \
throw convert2VAException(e); \
} catch (VistaExceptionBase& e) { \
} catch (VistaExceptionBase& e) { \
throw convert2VAException(e); \
} catch (...) { \
} catch (...) { \
throw getDefaultUnexpectedVAException(); \
} \
} catch (...)
} \
} catch (...)
#define VA_RETHROW \
catch (CVAException& e) { \
throw e; \
} catch (ITAException& e) { \
} catch (ITAException& e) { \
throw convert2VAException(e); \
} catch (VistaExceptionBase& e) { \
} catch (VistaExceptionBase& e) { \
throw convert2VAException(e); \
} catch (...) { \
} catch (...) { \
throw getDefaultUnexpectedVAException(); \
} \
} catch (...) { throw; }
} \
} catch (...) { throw; }
IVACore* VACore::CreateCoreInstance( const CVAStruct& oArgs )
......@@ -599,7 +599,7 @@ void CVACoreImpl::Initialize() {
FinishProgress();
}
VA_FINALLY
VA_FINALLY
{
// Aufrumen und Exception weiterwerfen
Tidyup();
......@@ -1121,8 +1121,7 @@ void CVACoreImpl::GetHRIRInfos( std::vector<CVAHRIRInfo>& vhiDest ) const {
* | | *
* +----------------------------------------------------------+ */
std::string CVACoreImpl::CreateAudiofileSignalSource( const std::string& sFilename,
const std::string& sName )
std::string CVACoreImpl::CreateAudiofileSignalSource( const std::string& sFilename, const std::string& sName )
{
VA_NO_REENTRANCE;
VA_CHECK_INITIALIZED;
......@@ -1149,11 +1148,36 @@ std::string CVACoreImpl::CreateAudiofileSignalSource( const std::string& sFilena
VA_RETHROW;
}
std::string CVACoreImpl::CreateSequencerSignalSource( const std::string& sName ) {
std::string CVACoreImpl::CreateTextToSpeechSignalSource( const std::string& sName /*= "" */ )
{
VA_NO_REENTRANCE;
VA_CHECK_INITIALIZED;
VA_TRY{
VA_TRY
{
std::string sID = m_pSignalSourceMan->CreateTextToSpeechSignalSource( sName );
assert( !sID.empty() );
CVACoreEvent ev;
ev.iEventType = CVACoreEvent::VA_COREEVENT_SIGNALSOURCE_CREATED;
ev.pSender = this;
ev.sObjectID = sID;
m_pCoreEventMan->BroadcastEvent( ev );
VA_INFO( "VACore", "Created text-to-speech signal source ( ID=" << sID << ", Name=\"" << sName << "\" )" );
return sID;
}
VA_RETHROW;
}
std::string CVACoreImpl::CreateSequencerSignalSource( const std::string& sName )
{
VA_NO_REENTRANCE;
VA_CHECK_INITIALIZED;
VA_TRY
{
std::string sID = m_pSignalSourceMan->CreateSequencerSignalSource( sName );
// Ereignis generieren, wenn Operation erfolgreich
......@@ -1166,7 +1190,8 @@ std::string CVACoreImpl::CreateSequencerSignalSource( const std::string& sName )
VA_INFO( "Core", "Created sequencer signal source (ID=" << sID << ", Name=\"" << sName << "\")" );
return sID;
} VA_RETHROW;
}
VA_RETHROW;
}
std::string CVACoreImpl::CreateNetworkStreamSignalSource( const std::string& sInterface, int iPort, const std::string& sName )
......@@ -1377,7 +1402,7 @@ void CVACoreImpl::SetAudiofileSignalSourcePlaybackAction( const std::string& sSi
VA_TRY
{
if( !IsValidAudiofileSignalSourcePlaybackAction( iPlaybackAction ) )
VA_EXCEPT2( INVALID_PARAMETER, "Invalid playback action" );
VA_EXCEPT2( INVALID_PARAMETER, "Invalid playback action" );
IVAAudioSignalSource* pSource = m_pSignalSourceMan->RequestSignalSource( sSignalSourceID );
......
This diff is collapsed.
Supports Markdown
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