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

Progress, VACoreImpl still abstract

parent 36f8ce42
......@@ -22,7 +22,7 @@
#endif // VACORE_DEFAULT_CONFIGFILE
// Foward declarations
class IVACore;
class IVAInterface;
namespace VACore
{
......@@ -31,10 +31,10 @@ namespace VACore
* @input oArgs Arguments with configuration for the core
* @output Pointer to the core instance (VA interface API from VABase)
*/
VACORE_API IVACore* CreateCoreInstance( const CVAStruct& oArgs );
VACORE_API IVAInterface* CreateCoreInstance( const CVAStruct& oArgs );
//! Factore method - create a VACore instance with configuration file
VACORE_API IVACore* CreateCoreInstance( const std::string& sConfigFile = VACORE_DEFAULT_CONFIGFILE );
VACORE_API IVAInterface* CreateCoreInstance( const std::string& sConfigFile = VACORE_DEFAULT_CONFIGFILE );
//! Returns the filesystem path of the VACore shared lib (e.g. VACore.dll)
VACORE_API std::string GetCoreLibFilePath();
......
......@@ -36,7 +36,7 @@
class ITADatasource;
class IVACore;
class IVAInterface;
class CVAAudiofileSignalSource;
class CVACoreImpl;
......
......@@ -14,7 +14,7 @@
#include "VAAudiofileSignalSource.h"
#include "../VAAudiostreamTracker.h"
#include <VACore.h>
#include <VA.h>
#include "../VALog.h"
#include <ITAException.h>
......@@ -28,8 +28,8 @@
CVAAudiofileSignalSource::CVAAudiofileSignalSource( int iBufferLength, double dSampleRate, int iBlockLength )
: m_pAssociatedCore( NULL )
, m_pBufferDataSource( NULL )
, m_iCurrentPlayState( IVACore::VA_PLAYBACK_STATE_INVALID )
, m_iRequestedPlaybackAction( IVACore::VA_PLAYBACK_ACTION_NONE )
, m_iCurrentPlayState( IVAInterface::VA_PLAYBACK_STATE_INVALID )
, m_iRequestedPlaybackAction( IVAInterface::VA_PLAYBACK_ACTION_NONE )
, m_iActiveAudioBufferChannel( 0 )
, m_bCrossfadeChannelSwitch( true )
{
......@@ -50,14 +50,14 @@ CVAAudiofileSignalSource::CVAAudiofileSignalSource( int iBufferLength, double dS
CVAAudiofileSignalSource::CVAAudiofileSignalSource( const std::string& sFileName, double dSampleRate, int iBlockLength )
: m_pAssociatedCore( NULL )
, m_pBufferDataSource( NULL )
, m_iCurrentPlayState( IVACore::VA_PLAYBACK_STATE_INVALID )
, m_iRequestedPlaybackAction( IVACore::VA_PLAYBACK_ACTION_NONE )
, m_iCurrentPlayState( IVAInterface::VA_PLAYBACK_STATE_INVALID )
, m_iRequestedPlaybackAction( IVAInterface::VA_PLAYBACK_ACTION_NONE )
, m_iActiveAudioBufferChannel( 0 )
, m_bCrossfadeChannelSwitch( true )
{
m_sbOutBuffer.Init( iBlockLength, true );
CITAAudioSample sfFileBuffer( dSampleRate );
CITAAudioSample sfFileBuffer( (float) dSampleRate );
sfFileBuffer.LoadWithSampleRateConversion( sFileName );
std::vector< float* > vfBufferPointer;
......@@ -103,12 +103,12 @@ void CVAAudiofileSignalSource::SetPlaybackAction( int iPlayStateAction )
// Store new play state, will be updated on next process of stream (if no sync mod)
switch( iPlayStateAction )
{
case IVACore::VA_PLAYBACK_ACTION_PAUSE:
case IVACore::VA_PLAYBACK_ACTION_PLAY:
case IVACore::VA_PLAYBACK_ACTION_STOP:
case IVAInterface::VA_PLAYBACK_ACTION_PAUSE:
case IVAInterface::VA_PLAYBACK_ACTION_PLAY:
case IVAInterface::VA_PLAYBACK_ACTION_STOP:
m_iRequestedPlaybackAction = iPlayStateAction;
break;
case IVACore::VA_PLAYBACK_ACTION_NONE:
case IVAInterface::VA_PLAYBACK_ACTION_NONE:
VA_WARN( "AudiofileSignalSource", "Ignoring playback action '" << iPlayStateAction << "' (NONE)" );
break;
default:
......@@ -157,11 +157,11 @@ std::string CVAAudiofileSignalSource::GetStateString( int iPlayState ) const
{
std::string s;
if( iPlayState == IVACore::VA_PLAYBACK_STATE_PLAYING )
if( iPlayState == IVAInterface::VA_PLAYBACK_STATE_PLAYING )
m_pBufferDataSource->GetLoopMode() ? s = "playing and looping" : s = "playing";
else if( iPlayState == IVACore::VA_PLAYBACK_STATE_PAUSED )
else if( iPlayState == IVAInterface::VA_PLAYBACK_STATE_PAUSED )
s = "paused";
else if( iPlayState == IVACore::VA_PLAYBACK_STATE_STOPPED )
else if( iPlayState == IVAInterface::VA_PLAYBACK_STATE_STOPPED )
s = "stopped";
else
s = "unkown";
......@@ -169,17 +169,17 @@ std::string CVAAudiofileSignalSource::GetStateString( int iPlayState ) const
return s;
}
IVACore* CVAAudiofileSignalSource::GetAssociatedCore() const
IVAInterface* CVAAudiofileSignalSource::GetAssociatedCore() const
{
return m_pAssociatedCore;
}
void CVAAudiofileSignalSource::HandleRegistration( IVACore* pParentCore )
void CVAAudiofileSignalSource::HandleRegistration( IVAInterface* pParentCore )
{
m_pAssociatedCore = pParentCore;
}
void CVAAudiofileSignalSource::HandleUnregistration( IVACore* )
void CVAAudiofileSignalSource::HandleUnregistration( IVAInterface* )
{
m_pAssociatedCore = nullptr;
}
......@@ -192,51 +192,51 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState
int iResidualSamples = m_pBufferDataSource->GetCursor() - m_pBufferDataSource->GetCapacity();
bool bEndOfFileReached = ( iResidualSamples >= 0 );
int iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_INVALID;
int iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_INVALID;
switch( m_iCurrentPlayState )
{
case IVACore::VA_PLAYBACK_STATE_STOPPED:
case IVAInterface::VA_PLAYBACK_STATE_STOPPED:
// Do not apply any changes during synced modification
if( bSyncMod )
break;
if( iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_PLAY )
if( iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_PLAY )
{
// Auto-rewind on play action
if( bEndOfFileReached )
m_pBufferDataSource->Rewind();
m_pBufferDataSource->SetPaused( false );
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_PLAYING;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_PLAYING;
}
else if( iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_PAUSE )
else if( iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_PAUSE )
{
// Auto-rewind on pause action
if( bEndOfFileReached )
m_pBufferDataSource->Rewind();
m_pBufferDataSource->SetPaused( true );
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_PLAYING;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_PLAYING;
}
else
{
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_STOPPED;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_STOPPED;
}
break;
case IVACore::VA_PLAYBACK_STATE_PAUSED:
case IVAInterface::VA_PLAYBACK_STATE_PAUSED:
// Do not apply any changes during synced modification
if( bSyncMod )
break;
if( iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_PLAY )
if( iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_PLAY )
{
if( bEndOfFileReached )
m_pBufferDataSource->Rewind();
m_pBufferDataSource->SetPaused( false );
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_PLAYING;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_PLAYING;
}
else if( iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_STOP )
else if( iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_STOP )
{
if( bEndOfFileReached )
m_pBufferDataSource->Rewind();
......@@ -244,15 +244,15 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState
m_pBufferDataSource->SetPaused( true );
m_pBufferDataSource->Rewind();
m_pBufferDataSource->SetPaused( true );
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_STOPPED;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_STOPPED;
}
else
{
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_PAUSED;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_PAUSED;
}
break;
case IVACore::VA_PLAYBACK_STATE_PLAYING:
case IVAInterface::VA_PLAYBACK_STATE_PLAYING:
// Do not apply any changes during synced modification, but process if required
if( bSyncMod )
{
......@@ -262,66 +262,66 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState
m_pBufferDataSource->Rewind();
if( m_pBufferDataSource->GetLoopMode() == false )
{
m_iCurrentPlayState = IVACore::VA_PLAYBACK_STATE_STOPPED; // Attention, directly modifying member, only OK here.
m_iCurrentPlayState = IVAInterface::VA_PLAYBACK_STATE_STOPPED; // Attention, directly modifying member, only OK here.
VA_INFO( "AudiofileSignalSource", "Playback stop transition forced during locked scene." );
}
}
break;
}
if( iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_PAUSE )
if( iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_PAUSE )
{
if( bEndOfFileReached )
m_pBufferDataSource->Rewind();
m_pBufferDataSource->SetPaused( true );
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_PAUSED;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_PAUSED;
}
else if( iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_STOP )
else if( iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_STOP )
{
m_pBufferDataSource->Rewind();
m_pBufferDataSource->SetPaused( true );
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_STOPPED;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_STOPPED;
}
else
{
// Still playing
assert( iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_PLAY || iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_NONE );
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_PLAYING; // Overwrite invalid play action (NONE)
assert( iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_PLAY || iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_NONE );
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_PLAYING; // Overwrite invalid play action (NONE)
if( bEndOfFileReached )
{
m_pBufferDataSource->Rewind();
if( m_pBufferDataSource->GetLoopMode() == false )
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_STOPPED;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_STOPPED;
}
}
break;
case IVACore::VA_PLAYBACK_STATE_INVALID:
case IVAInterface::VA_PLAYBACK_STATE_INVALID:
// Do not apply any changes during synced modification
if( bSyncMod )
break;
if( iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_PLAY )
if( iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_PLAY )
{
m_pBufferDataSource->Rewind();
m_pBufferDataSource->SetPaused( false );
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_PLAYING;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_PLAYING;
}
else if( iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_PAUSE )
else if( iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_PAUSE )
{
m_pBufferDataSource->Rewind();
m_pBufferDataSource->SetPaused( true );
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_PAUSED;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_PAUSED;
}
else if( iNewPlayAction == IVACore::VA_PLAYBACK_ACTION_STOP )
else if( iNewPlayAction == IVAInterface::VA_PLAYBACK_ACTION_STOP )
{
m_pBufferDataSource->Rewind();
m_pBufferDataSource->SetPaused( true );
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_STOPPED;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_STOPPED;
}
else
{
iNewPlaybackState = IVACore::VA_PLAYBACK_STATE_INVALID;
iNewPlaybackState = IVAInterface::VA_PLAYBACK_STATE_INVALID;
}
break;
}
......@@ -331,12 +331,12 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState
VA_INFO( "AudiofileSignalSource", "Playback transition from '" << GetStateString( m_iCurrentPlayState ) << "'" <<
" to '" << GetStateString( iNewPlaybackState ) << "'" );
assert( iNewPlaybackState != IVACore::VA_PLAYBACK_STATE_INVALID );
assert( iNewPlaybackState != IVAInterface::VA_PLAYBACK_STATE_INVALID );
m_iCurrentPlayState = iNewPlaybackState;
}
// Process audio file signal source: copy samples from buffer
if( m_iCurrentPlayState == IVACore::VA_PLAYBACK_STATE_PLAYING )
if( m_iCurrentPlayState == IVAInterface::VA_PLAYBACK_STATE_PLAYING )
{
const float* pfData = m_pBufferDataSource->GetBlockPointer( m_iActiveAudioBufferChannel, dynamic_cast< const CVAAudiostreamStateImpl* >( pStreamInfo ) );
if( pfData )
......@@ -352,7 +352,7 @@ const float* CVAAudiofileSignalSource::GetStreamBlock( const CVAAudiostreamState
// No intermediate playback actions received? Then ack.
if( m_iRequestedPlaybackAction == iNewPlayAction && !bSyncMod )
m_iRequestedPlaybackAction = IVACore::VA_PLAYBACK_ACTION_NONE;
m_iRequestedPlaybackAction = IVAInterface::VA_PLAYBACK_ACTION_NONE;
return m_sbOutBuffer.data();
}
......
......@@ -48,14 +48,14 @@ public:
std::string GetDesc() const;
std::string GetStateString() const;
std::string GetStateString( int iPlayState ) const;
IVACore* GetAssociatedCore() const;
IVAInterface* GetAssociatedCore() const;
const float* GetStreamBlock(const CVAAudiostreamState* pStreamInfo);
void SetParameters( const CVAStruct& ) {};
CVAStruct GetParameters( const CVAStruct& ) const { return CVAStruct(); };
private:
IVACore* m_pAssociatedCore;
IVAInterface* m_pAssociatedCore;
ITABufferDatasource* m_pBufferDataSource;
ITAAtomicInt m_iCurrentPlayState;
ITAAtomicInt m_iRequestedPlaybackAction; //!< User-triggered playback action
......@@ -64,8 +64,8 @@ private:
int m_iActiveAudioBufferChannel;
bool m_bCrossfadeChannelSwitch;
void HandleRegistration( IVACore* pParentCore );
void HandleUnregistration( IVACore* pParentCore );
void HandleRegistration( IVAInterface* pParentCore );
void HandleUnregistration( IVAInterface* pParentCore );
};
#endif // IW_VACORE_AUDIOFILESIGNALSOURCE
......@@ -47,17 +47,17 @@ std::string CVADeviceInputSignalSource::GetStateString() const
return "";
}
IVACore* CVADeviceInputSignalSource::GetAssociatedCore() const
IVAInterface* CVADeviceInputSignalSource::GetAssociatedCore() const
{
return m_pAssociatedCore;
}
void CVADeviceInputSignalSource::HandleRegistration( IVACore* pParentCore )
void CVADeviceInputSignalSource::HandleRegistration( IVAInterface* pParentCore )
{
m_pAssociatedCore = pParentCore;
}
void CVADeviceInputSignalSource::HandleUnregistration( IVACore* )
void CVADeviceInputSignalSource::HandleUnregistration( IVAInterface* )
{
m_pAssociatedCore = nullptr;
}
......
......@@ -37,18 +37,18 @@ public:
std::string GetTypeString() const;
std::string GetDesc() const;
std::string GetStateString() const;
IVACore* GetAssociatedCore() const;
IVAInterface* GetAssociatedCore() const;
const float* GetStreamBlock(const CVAAudiostreamState* pStreamInfo);
void SetParameters( const CVAStruct& ) {};
CVAStruct GetParameters( const CVAStruct& ) const { return CVAStruct(); };
private:
IVACore* m_pAssociatedCore;
IVAInterface* m_pAssociatedCore;
std::string m_sDesc;
ITASampleBuffer* m_psbInputData;
void HandleRegistration(IVACore* pParentCore);
void HandleUnregistration(IVACore* pParentCore);
void HandleRegistration(IVAInterface* pParentCore);
void HandleUnregistration(IVAInterface* pParentCore);
};
#endif // IW_VACORE_DEVICEINPUTSIGNALSOURCE
......@@ -61,7 +61,7 @@ std::string CVAEngineSignalSource::GetDesc() const
return std::string( "Creates the modal spectrum of a rotating engine" );
}
IVACore* CVAEngineSignalSource::GetAssociatedCore() const
IVAInterface* CVAEngineSignalSource::GetAssociatedCore() const
{
return m_pAssociatedCore;
}
......@@ -94,12 +94,12 @@ const float* CVAEngineSignalSource::GetStreamBlock( const CVAAudiostreamState* p
return m_sbBuffer.data();
}
void CVAEngineSignalSource::HandleRegistration( IVACore* pCore )
void CVAEngineSignalSource::HandleRegistration( IVAInterface* pCore )
{
m_pAssociatedCore = pCore;
}
void CVAEngineSignalSource::HandleUnregistration( IVACore* )
void CVAEngineSignalSource::HandleUnregistration( IVAInterface* )
{
m_pAssociatedCore = NULL;
}
......
......@@ -46,10 +46,10 @@ public:
int GetType() const;
std::string GetTypeString() const;
std::string GetDesc() const;
IVACore* GetAssociatedCore() const;
IVAInterface* GetAssociatedCore() const;
const float* GetStreamBlock( const CVAAudiostreamState* );
void HandleRegistration( IVACore* );
void HandleUnregistration( IVACore* );
void HandleRegistration( IVAInterface* );
void HandleUnregistration( IVAInterface* );
std::string GetStateString() const { return "running engine"; };
void SetParameters( const CVAStruct& );
......@@ -58,7 +58,7 @@ public:
void SetEngineNumber( const double& dK );
private:
IVACore* m_pAssociatedCore;
IVAInterface* m_pAssociatedCore;
Config m_oConfig;
ITASampleBuffer m_sbBuffer;
std::map< double, double > m_lFreqModesPhase;
......
......@@ -81,7 +81,7 @@ std::string CVAMachineSignalSource::GetDesc() const
return std::string( "Creates a machine that can be started and stopped" );
}
IVACore* CVAMachineSignalSource::GetAssociatedCore() const
IVAInterface* CVAMachineSignalSource::GetAssociatedCore() const
{
return m_oConfig.pCore;
}
......@@ -235,12 +235,12 @@ const float* CVAMachineSignalSource::GetStreamBlock( const CVAAudiostreamState*
return m_sbOut.data();
}
void CVAMachineSignalSource::HandleRegistration( IVACore* pCore )
void CVAMachineSignalSource::HandleRegistration( IVAInterface* pCore )
{
m_pAssociatedCore = pCore;
}
void CVAMachineSignalSource::HandleUnregistration( IVACore* )
void CVAMachineSignalSource::HandleUnregistration( IVAInterface* )
{
m_pAssociatedCore = NULL;
}
......
......@@ -90,10 +90,10 @@ public:
int GetType() const;
std::string GetTypeString() const;
std::string GetDesc() const;
IVACore* GetAssociatedCore() const;
IVAInterface* GetAssociatedCore() const;
const float* GetStreamBlock( const CVAAudiostreamState* );
void HandleRegistration( IVACore* );
void HandleUnregistration( IVACore* );
void HandleRegistration( IVAInterface* );
void HandleUnregistration( IVAInterface* );
std::string GetStateString() const;
void SetParameters( const CVAStruct& );
CVAStruct GetParameters( const CVAStruct& ) const;
......@@ -139,7 +139,7 @@ public:
private:
IVACore* m_pAssociatedCore;
IVAInterface* m_pAssociatedCore;
Config m_oConfig;
ITASampleBuffer m_sbStartSound, m_sbStartSoundNew;
ITASampleBuffer m_sbIdleSound, m_sbIdleSoundNew;
......
......@@ -68,7 +68,7 @@ std::string CVANetstreamSignalSource::GetStateString() const
return "Disconnected";
}
IVACore* CVANetstreamSignalSource::GetAssociatedCore() const
IVAInterface* CVANetstreamSignalSource::GetAssociatedCore() const
{
return m_pAssociatedCore;
}
......@@ -85,12 +85,12 @@ const float* CVANetstreamSignalSource::GetStreamBlock( const CVAAudiostreamState
return pfSignalSourceData;
}
void CVANetstreamSignalSource::HandleRegistration( IVACore* pParentCore )
void CVANetstreamSignalSource::HandleRegistration( IVAInterface* pParentCore )
{
m_pAssociatedCore = pParentCore;
}
void CVANetstreamSignalSource::HandleUnregistration( IVACore* )
void CVANetstreamSignalSource::HandleUnregistration( IVAInterface* )
{
m_pAssociatedCore = NULL;
}
......@@ -17,7 +17,7 @@
#include "VAAudioSignalSource.h"
#include <string>
class IVACore;
class IVAInterface;
class CITANetAudioStream;
class ITADatasource;
......@@ -46,7 +46,7 @@ public:
std::string GetTypeMnemonic() const;
std::string GetDesc() const;
std::string GetStateString() const;
IVACore* GetAssociatedCore() const;
IVAInterface* GetAssociatedCore() const;
ITADatasource* GetStreamingDatasource() const;
inline int GetType() const { return VA_SS_NETSTREAM; };
const float* GetStreamBlock( const CVAAudiostreamState* pStreamInfo );
......@@ -55,11 +55,11 @@ public:
inline virtual void SetParameters( const CVAStruct& ) {};
private:
IVACore* m_pAssociatedCore;
IVAInterface* m_pAssociatedCore;
CITANetAudioStream* m_pSourceStream;
void HandleRegistration( IVACore* pParentCore );
void HandleUnregistration( IVACore* pParentCore );
void HandleRegistration( IVAInterface* pParentCore );
void HandleUnregistration( IVAInterface* pParentCore );
};
#endif // IW_VACORE_NETSTREAMSIGNALSOURCE
......@@ -56,7 +56,7 @@ std::string CVASequencerSignalSource::GetStateString() const {
return "<TODO: State string>";
}
IVACore* CVASequencerSignalSource::GetAssociatedCore() const {
IVAInterface* CVASequencerSignalSource::GetAssociatedCore() const {
return m_pAssociatedCore;
}
......@@ -77,10 +77,10 @@ const float* CVASequencerSignalSource::GetStreamBlock(const CVAAudiostreamState*
return pfData;
}
void CVASequencerSignalSource::HandleRegistration(IVACore* pParentCore) {
void CVASequencerSignalSource::HandleRegistration(IVAInterface* pParentCore) {
m_pAssociatedCore = pParentCore;
}
void CVASequencerSignalSource::HandleUnregistration(IVACore* pParentCore) {
void CVASequencerSignalSource::HandleUnregistration(IVAInterface* pParentCore) {
m_pAssociatedCore = nullptr;
}
\ No newline at end of file
......@@ -41,19 +41,19 @@ public:
std::string GetTypeMnemonic() const;
std::string GetDesc() const;
std::string GetStateString() const;
IVACore* GetAssociatedCore() const;
IVAInterface* GetAssociatedCore() const;
const float* GetStreamBlock(const CVAAudiostreamState* pStreamInfo);
void SetParameters( const CVAStruct& ) {};
CVAStruct GetParameters( const CVAStruct& ) const { return CVAStruct(); };
private:
IVACore* m_pAssociatedCore;
IVAInterface* m_pAssociatedCore;
ITASoundSampler* m_pSampler;
ITASoundSamplePool* m_pSamplePool;
int m_iTrackID;
void HandleRegistration(IVACore* pParentCore);
void HandleUnregistration(IVACore* pParentCore);
void HandleRegistration(IVAInterface* pParentCore);
void HandleUnregistration(IVAInterface* pParentCore);
};
#endif // IW_VACORE_SEQUENCERSIGNALSOURCE
......@@ -49,7 +49,7 @@ CVATextToSpeechSignalSource::CVATextToSpeechSignalSource( const double dSampleRa
{
m_sbOut.Init( GetBlocklength(), true );
TTSEngine::getInstance(); //so it is initialized!
m_iCurrentPlayState = IVACore::VA_PLAYBACK_ACTION_STOP;
m_iCurrentPlayState = IVAInterface::VA_PLAYBACK_ACTION_STOP;
}
......@@ -74,7 +74,7 @@ std::string CVATextToSpeechSignalSource::GetDesc() const
return std::string( "Creates spoken text and facial movements from a text" );
}
IVACore* CVATextToSpeechSignalSource::GetAssociatedCore() const
IVAInterface* CVATextToSpeechSignalSource::GetAssociatedCore() const
{
return m_pAssociatedCore;
}
......@@ -87,12 +87,15 @@ const float* CVATextToSpeechSignalSource::GetStreamBlock( const CVAAudiostreamSt
m_sbOut.Zero();
if (m_pBufferDataSource != NULL){
if (m_pBufferDataSource != NULL)
{