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

Applying renaming of VA event ids

parent b81fa5bc
......@@ -457,15 +457,18 @@ void CVAAudioSignalSourceManager::ReleaseSignalSource( IVAAudioSignalSource* pSo
it->second.iRefCount--;
}
void CVAAudioSignalSourceManager::SyncSignalSources() {
void CVAAudioSignalSourceManager::SyncSignalSources()
{
// Diese Methode wartet einen Stream-Zyklus ab und stellt damit sicher
// das alle nderung an den Signalquellen im Audio-Stream Kontext abgearbeitet wurden.
// Falls Streaming nicht im Gange => Nicht warten
if( !m_pParentCore->IsStreaming() ) return;
if( !m_pParentCore->IsStreaming() )
return;
// Keine Ketten => Nicht warten (sonst Deadlock)
if( m_mRecords.empty() ) return;
if( m_mRecords.empty() )
return;
// Aktuellen Stream-Counter ermitteln
int iEntryCount = m_iStreamCounter;
......
......@@ -140,7 +140,7 @@ public:
private:
// Hilfsklasse welche registrierte Audiosignalquellen beschreibt
class CAudioSignalSourceRecord
class CAudioSignalSource
{
public:
IVAAudioSignalSource* pSource; // Audiosignalquelle
......@@ -150,7 +150,7 @@ private:
bool bManaged; // Ist der Manager Besitzer der Quelle?
bool bDynamic; // Kann die Quelle zur Laufzeit entfernt werden?
inline CAudioSignalSourceRecord( IVAAudioSignalSource* pSource, const std::string& sName, int iBlockLength, bool bManaged, bool bDynamic )
inline CAudioSignalSource( IVAAudioSignalSource* pSource, const std::string& sName, int iBlockLength, bool bManaged, bool bDynamic )
: sbSampleBuffer( iBlockLength, false )
, pSource( pSource )
, sName( sName )
......@@ -160,13 +160,13 @@ private:
{};
};
typedef std::map<std::string, CAudioSignalSourceRecord> RecordMap;
typedef std::pair<std::string, CAudioSignalSourceRecord> RecordItem;
typedef RecordMap::iterator RecordMapIt;
typedef RecordMap::const_iterator RecordMapCit;
typedef std::map<std::string, CAudioSignalSource> SignalSourceMap;
typedef std::pair<std::string, CAudioSignalSource> SignalSourceItem;
typedef SignalSourceMap::iterator SignalSourceMapIt;
typedef SignalSourceMap::const_iterator SignalSourceMapCit;
RecordMap m_mRecords; // Assoziationen ID -> Eintrag
ITACriticalSection m_csRecords; // Lock fr die Quellen
SignalSourceMap m_mSignalSources; // Assoziationen ID -> Eintrag
ITACriticalSection m_csSignalSourceAccess; // Lock fr die Quellen
std::map<std::string, int> m_mMnemonicCount; // Zhler fr Mnemonics (fr Zahl in den IDs)
CVACoreImpl* m_pParentCore;
......@@ -178,19 +178,21 @@ private:
std::vector<ITASampleBuffer> m_vsbDeviceInputBuffers; // Samplepuffer fr die Audio-Eingnge
std::vector< std::string > m_vsDeviceInputSourceIDs; // Eingangsnummer -> Datenquellen-ID
std::set<CAudioSignalSourceRecord*> m_spIntSources; // Audiostream-interne Liste der Quellen
tbb::concurrent_queue<CAudioSignalSourceRecord*> m_qpNewSources; //!< Lock-free queue: New sources
tbb::concurrent_queue<CAudioSignalSourceRecord*> m_qpDelReqSources; //!< Lock-free queue: Request delete sources
std::set<CAudioSignalSource*> m_spIntSources; // Audiostream-interne Liste der Quellen
tbb::concurrent_queue<CAudioSignalSource*> m_qpNewSources; //!< Lock-free queue: New sources
tbb::concurrent_queue<CAudioSignalSource*> m_qpDelReqSources; //!< Lock-free queue: Request delete sources
ITAAtomicInt m_iStreamCounter; //!< Counts the number of processed stream blocks
VistaThreadEvent m_evStreamCounterInc; //!< Event: Stream counter incremented
// Record anhand der ID suchen
RecordMapIt FindSignalSource( const std::string& sID );
RecordMapCit FindSignalSource( const std::string& sID ) const;
//! Signal source find by ID
SignalSourceMapIt FindSignalSource( const std::string& sID );
// Record anhand des Instanzzeigers suchen
RecordMapIt FindSignalSource( IVAAudioSignalSource* pSource );
//! Signal source find by ID (const)
SignalSourceMapCit FindSignalSource( const std::string& sID ) const;
//! Signal source find by pointer
SignalSourceMapIt FindSignalSource( IVAAudioSignalSource* pSource );
//! Warten bis im Streaming-Kontext die nderung an den Signalquellen bernommen wurde [blocking]
void SyncSignalSources();
......
......@@ -358,7 +358,7 @@ CVACoreImpl::~CVACoreImpl()
// Nachricht senden [blocking], das die Kerninstanz gelscht wird.
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_DESTROY;
ev.iEventType = CVAEvent::DESTROY;
ev.pSender = this;
m_pEventManager->BroadcastEvent( ev );
......@@ -649,7 +649,7 @@ void CVACoreImpl::Reset()
// Ereignis generieren, wenn Operation erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_RESET;
ev.iEventType = CVAEvent::RESET;
ev.pSender = this;
m_pEventManager->BroadcastEvent( ev );
......@@ -906,7 +906,7 @@ CVAStruct CVACoreImpl::CallModule( const std::string& sModuleName, const CVAStru
#ifdef VACORE_MODULE_INTERFACE_MECHANISM_EVENT_BASED
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_STATE_CHANGED;
ev.iEventType = CVAEvent::SIGNALSOURCE_STATE_CHANGED;
ev.pSender = this;
ev.sObjectID = sModuleName;
ev;
......@@ -1024,7 +1024,7 @@ int CVACoreImpl::CreateDirectivityFromParameters( const CVAStruct& oParams, cons
assert( iDirID != -1 );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_DIRECTIVITY_LOADED;
ev.iEventType = CVAEvent::DIRECTIVITY_LOADED;
ev.pSender = this;
ev.iObjectID = iDirID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1048,7 +1048,7 @@ bool CVACoreImpl::DeleteDirectivity( const int iDirID )
// Ereignis generieren, wenn Operation erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_DIRECTIVITY_DELETED;
ev.iEventType = CVAEvent::DIRECTIVITY_DELETED;
ev.pSender = this;
ev.iObjectID = iDirID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1254,7 +1254,7 @@ std::string CVACoreImpl::CreateSignalSourceBufferFromParameters( const CVAStruct
assert( !sID.empty() );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_CREATED;
ev.iEventType = CVAEvent::SIGNALSOURCE_CREATED;
ev.pSender = this;
ev.sObjectID = sID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1282,7 +1282,7 @@ std::string CVACoreImpl::CreateSignalSourceTextToSpeech( const std::string& sNam
assert( !sID.empty() );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_CREATED;
ev.iEventType = CVAEvent::SIGNALSOURCE_CREATED;
ev.pSender = this;
ev.sObjectID = sID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1305,7 +1305,7 @@ std::string CVACoreImpl::CreateSignalSourceSequencer( const std::string& sName )
// Ereignis generieren, wenn Operation erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_CREATED;
ev.iEventType = CVAEvent::SIGNALSOURCE_CREATED;
ev.pSender = this;
ev.sObjectID = sID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1330,7 +1330,7 @@ std::string CVACoreImpl::CreateSignalSourceNetworkStream( const std::string& sIn
// Ereignis generieren, wenn Operation erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_CREATED;
ev.iEventType = CVAEvent::SIGNALSOURCE_CREATED;
ev.pSender = this;
ev.sObjectID = sID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1353,7 +1353,7 @@ std::string CVACoreImpl::CreateSignalSourceEngine( const CVAStruct&, const std::
// Ereignis generieren, wenn Operation erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_CREATED;
ev.iEventType = CVAEvent::SIGNALSOURCE_CREATED;
ev.pSender = this;
ev.sObjectID = sID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1391,7 +1391,7 @@ bool CVACoreImpl::DeleteSignalSource( const std::string& sID )
// Ereignis generieren, wenn Operation erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_DELETED;
ev.iEventType = CVAEvent::SIGNALSOURCE_DELETED;
ev.pSender = this;
ev.sObjectID = sID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1414,7 +1414,7 @@ std::string CVACoreImpl::RegisterSignalSource( IVAAudioSignalSource* pSignalSour
// Ereignis generieren, wenn Operation erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_REGISTERED;
ev.iEventType = CVAEvent::SIGNALSOURCE_REGISTERED;
ev.pSender = this;
ev.sObjectID = sID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1440,7 +1440,7 @@ bool CVACoreImpl::UnregisterSignalSource( IVAAudioSignalSource* pSignalSource )
// Ereignis generieren, wenn Operation erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_UNREGISTERED;
ev.iEventType = CVAEvent::SIGNALSOURCE_UNREGISTERED;
ev.pSender = this;
ev.sObjectID = sID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1523,7 +1523,7 @@ void CVACoreImpl::SetSignalSourceParameters( const std::string& sSignalSourceID,
pSource->SetParameters( oParams );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_STATE_CHANGED;
ev.iEventType = CVAEvent::SIGNALSOURCE_STATE_CHANGED;
ev.pSender = this;
ev.sObjectID = sSignalSourceID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1558,7 +1558,7 @@ void CVACoreImpl::SetSignalSourceBufferPlaybackAction( const std::string& sSigna
pAudiofileSource->SetPlaybackAction( iPlaybackAction );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_STATE_CHANGED;
ev.iEventType = CVAEvent::SIGNALSOURCE_STATE_CHANGED;
ev.pSender = this;
ev.sObjectID = sSignalSourceID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1638,7 +1638,7 @@ void CVACoreImpl::SetSignalSourceBufferLooping( const std::string& sSignalSource
pAudiofileSource->SetIsLooping( bLooping );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SIGNALSOURCE_STATE_CHANGED;
ev.iEventType = CVAEvent::SIGNALSOURCE_STATE_CHANGED;
ev.pSender = this;
ev.sObjectID = sSignalSourceID;
m_pEventManager->BroadcastEvent( ev );
......@@ -1921,7 +1921,7 @@ int CVACoreImpl::CreateSoundSource( const std::string& sName )
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CREATED;
ev.iEventType = CVAEvent::SOUND_SOURCE_CREATED;
ev.pSender = this;
ev.iObjectID = iSourceID;
ev.sName = sName;
......@@ -1978,7 +1978,7 @@ int CVACoreImpl::CreateSoundSourceExplicitRenderer( const std::string& sRenderer
assert( pSourceState );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CREATED;
ev.iEventType = CVAEvent::SOUND_SOURCE_CREATED;
ev.pSender = this;
ev.iObjectID = iSourceID;
ev.sName = sName;
......@@ -2019,7 +2019,7 @@ int CVACoreImpl::DeleteSoundSource( const int iSoundSourceID )
{
// Ereignis generieren, wenn erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_DELETED;
ev.iEventType = CVAEvent::SOUND_SOURCE_DELETED;
ev.pSender = this;
ev.iObjectID = iSoundSourceID;
m_pEventManager->EnqueueEvent( ev );
......@@ -2055,7 +2055,7 @@ void CVACoreImpl::SetSoundSourceEnabled( const int iSoundSourceID, const bool bE
pDesc->bEnabled = bEnabled;
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_MUTING; // @todo JST new event type
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_MUTING; // @todo JST new event type
ev.pSender = this;
ev.iObjectID = iSoundSourceID;
//ev.bEnabled = bEnabled; // @todo JST
......@@ -2104,7 +2104,7 @@ void CVACoreImpl::SetSoundSourceName( const int iSoundSourceID, const std::strin
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_NAME;
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_NAME;
ev.pSender = this;
ev.iObjectID = iSoundSourceID;
ev.sName = sName;
......@@ -2166,7 +2166,7 @@ void CVACoreImpl::SetSoundSourceSignalSource( int iSoundSourceID, const std::str
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE;
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_SIGNALSOURCE;
ev.pSender = this;
ev.iObjectID = iSoundSourceID;
ev.sParam = sSignalSourceID;
......@@ -2238,7 +2238,7 @@ void CVACoreImpl::SetSoundSourceAuralizationMode( int iSoundSourceID, int iAural
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE;
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_AURALIZATIONMODE;
ev.pSender = this;
ev.iObjectID = iSoundSourceID;
ev.iAuralizationMode = iAuralizationMode;
......@@ -2276,7 +2276,7 @@ void CVACoreImpl::SetSoundSourceParameters( int iID, const CVAStruct& oParams )
pSoundSourceState->SetParameters( oParams );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_NAME; // @todo create own core event "parameter changed"
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_NAME; // @todo create own core event "parameter changed"
ev.pSender = this;
ev.iObjectID = iID;
// ev.oStruct @todo: add a struct to the event
......@@ -2359,7 +2359,7 @@ void CVACoreImpl::SetSoundSourceDirectivity( const int iSoundSourceID, const int
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY;
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_DIRECTIVITY;
ev.pSender = this;
ev.iObjectID = iSoundSourceID;
ev.iParamID = iDirectivityID;
......@@ -2419,7 +2419,7 @@ void CVACoreImpl::SetSoundSourceSoundPower( const int iSoundSourceID, const doub
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_SOUND_POWER;
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_SOUND_POWER;
ev.pSender = this;
ev.iObjectID = iSoundSourceID;
ev.dVolume = dSoundPower;
......@@ -2457,7 +2457,7 @@ void CVACoreImpl::SetSoundSourceMuted( const int iSoundSourceID, const bool bMut
pDesc->bMuted = bMuted;
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_MUTING;
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_MUTING;
ev.pSender = this;
ev.iObjectID = iSoundSourceID;
ev.bMuted = bMuted;
......@@ -2522,7 +2522,7 @@ void CVACoreImpl::SetSoundSourcePose( const int iID, const VAVec3& v3Pos, const
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_POSE;
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iID;
ev.vPos = v3Pos;
......@@ -2587,7 +2587,7 @@ void CVACoreImpl::SetSoundSourcePosition( const int iID, const VAVec3& v3Pos )
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_POSE;
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iID;
ev.vPos = v3Pos;
......@@ -2651,7 +2651,7 @@ void CVACoreImpl::SetSoundSourceOrientation( const int iID, const VAQuat& qOrien
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_POSE;
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iID;
//ev.qOrient = qOrient; // @todo
......@@ -2699,7 +2699,7 @@ void CVACoreImpl::SetSoundSourceOrientationVU( const int iSoundSourceID, const V
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_SOURCE_CHANGED_POSE;
ev.iEventType = CVAEvent::SOUND_SOURCE_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iSoundSourceID;
ev.vView = v3View;
......@@ -2766,7 +2766,7 @@ int CVACoreImpl::CreateSoundReceiver( const std::string& sName )
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CREATED;
ev.iEventType = CVAEvent::SOUND_RECEIVER_CREATED;
ev.pSender = this;
ev.iObjectID = iID;
ev.sName = sName;
......@@ -2804,7 +2804,7 @@ int CVACoreImpl::DeleteSoundReceiver( const int iID )
m_pNewSceneState->RemoveListener( iID );
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_DELETED;
ev.iEventType = CVAEvent::SOUND_RECEIVER_DELETED;
ev.pSender = this;
ev.iObjectID = iID;
m_pEventManager->EnqueueEvent( ev );
......@@ -2869,7 +2869,7 @@ int CVACoreImpl::CreateSoundReceiverExplicitRenderer( const std::string& sRender
assert( pListenerState );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CREATED;
ev.iEventType = CVAEvent::SOUND_RECEIVER_CREATED;
ev.pSender = this;
ev.iObjectID = iListenerID;
ev.sName = sName;
......@@ -2906,7 +2906,7 @@ void CVACoreImpl::SetSoundReceiverEnabled( const int iID, const bool bEnabled )
pDesc->bEnabled = bEnabled;
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CHANGED_NAME; // @todo JST new event type
ev.iEventType = CVAEvent::SOUND_RECEIVER_CHANGED_NAME; // @todo JST new event type
ev.pSender = this;
ev.iObjectID = iID;
//ev.bEnabled = bEnabled; // @todo JST
......@@ -2966,7 +2966,7 @@ void CVACoreImpl::SetSoundReceiverName( const int iID, const std::string& sName
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CHANGED_NAME;
ev.iEventType = CVAEvent::SOUND_RECEIVER_CHANGED_NAME;
ev.pSender = this;
ev.iObjectID = iID;
ev.sName = sName;
......@@ -3019,7 +3019,7 @@ void CVACoreImpl::SetSoundReceiverAuralizationMode( const int iID, const int iAu
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE;
ev.iEventType = CVAEvent::SOUND_RECEIVER_CHANGED_AURALIZATIONMODE;
ev.pSender = this;
ev.iObjectID = iID;
ev.iAuralizationMode = iAuralizationMode;
......@@ -3055,7 +3055,7 @@ void CVACoreImpl::SetSoundReceiverParameters( const int iID, const CVAStruct& oP
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CHANGED_NAME; // @todo create own core event "parameter changed"
ev.iEventType = CVAEvent::SOUND_RECEIVER_CHANGED_NAME; // @todo create own core event "parameter changed"
ev.pSender = this;
ev.iObjectID = iID;
// ev.oStruct @todo: add a struct to the event
......@@ -3144,7 +3144,7 @@ void CVACoreImpl::SetSoundReceiverDirectivity( const int iID, const int iDirecti
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY;
ev.iEventType = CVAEvent::SOUND_RECEIVER_CHANGED_DIRECTIVITY;
ev.pSender = this;
ev.iObjectID = iID;
ev.iParamID = iDirectivityID;
......@@ -3220,7 +3220,7 @@ void CVACoreImpl::SetSoundReceiverPose( const int iID, const VAVec3& v3Pos, cons
// Ereignis generieren, falls erfolgreich
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CHANGED_POSE;
ev.iEventType = CVAEvent::SOUND_RECEIVER_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iID;
ev.vPos = v3Pos;
......@@ -3283,7 +3283,7 @@ void CVACoreImpl::SetSoundReceiverPosition( const int iID, const VAVec3& v3Pos )
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CHANGED_POSE;
ev.iEventType = CVAEvent::SOUND_RECEIVER_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iID;
SetCoreEventParams( ev, pNewMotionState );
......@@ -3326,7 +3326,7 @@ void CVACoreImpl::SetSoundReceiverOrientationVU( const int iID, const VAVec3& v3
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CHANGED_POSE;
ev.iEventType = CVAEvent::SOUND_RECEIVER_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iID;
SetCoreEventParams( ev, pNewMotionState );
......@@ -3387,7 +3387,7 @@ void CVACoreImpl::SetSoundReceiverOrientation( const int iID, const VAQuat& qOri
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_RECEIVER_CHANGED_POSE;
ev.iEventType = CVAEvent::SOUND_RECEIVER_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iID;
SetCoreEventParams( ev, pNewMotionState );
......@@ -3513,7 +3513,7 @@ void CVACoreImpl::SetSoundReceiverRealWorldPositionOrientationVU( const int iID,
/* Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_REAL_WORLD_SOUND_RECEIVER_CHANGED_POSE;
ev.iEventType = CVAEvent::REAL_WORLD_SOUND_RECEIVER_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iID;
SetCoreEventParams( ev, pNewMotionState );
......@@ -3580,7 +3580,7 @@ void CVACoreImpl::SetSoundReceiverRealWorldPose( const int iID, const VAVec3& v3
/* Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_REAL_WORLD_SOUND_RECEIVER_CHANGED_POSE;
ev.iEventType = CVAEvent::REAL_WORLD_SOUND_RECEIVER_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iID;
SetCoreEventParams( ev, pNewMotionState );
......@@ -3642,7 +3642,7 @@ void CVACoreImpl::SetSoundReceiverRealWorldHeadAboveTorsoOrientation( const int
/* Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_REAL_WORLD_SOUND_RECEIVER_CHANGED_POSE;
ev.iEventType = CVAEvent::REAL_WORLD_SOUND_RECEIVER_CHANGED_POSE;
ev.pSender = this;
ev.iObjectID = iID;
SetCoreEventParams( ev, pNewMotionState );
......@@ -3873,7 +3873,7 @@ void CVACoreImpl::SetSoundPortalName( const int iPortalID, const std::string& sN
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_SOUND_PORTAL_CHANGED_NAME;
ev.iEventType = CVAEvent::SOUND_PORTAL_CHANGED_NAME;
ev.pSender = this;
ev.iObjectID = iPortalID;
ev.sName = sName;
......@@ -4008,7 +4008,7 @@ void CVACoreImpl::SetInputMuted( const bool bMuted )
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_INPUT_MUTING_CHANGED;
ev.iEventType = CVAEvent::INPUT_MUTING_CHANGED;
ev.pSender = this;
ev.bMuted = m_bInputMuted;
m_pEventManager->BroadcastEvent( ev );
......@@ -4049,7 +4049,7 @@ void CVACoreImpl::SetInputGain( double dGain )
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_INPUT_GAIN_CHANGED;
ev.iEventType = CVAEvent::INPUT_GAIN_CHANGED;
ev.pSender = this;
ev.dVolume = dGain;
m_pEventManager->BroadcastEvent( ev );
......@@ -4090,7 +4090,7 @@ void CVACoreImpl::SetOutputGain( const double dGain )
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_OUTPUT_GAIN_CHANGED;
ev.iEventType = CVAEvent::OUTPUT_GAIN_CHANGED;
ev.pSender = this;
ev.dVolume = dGain;
m_pEventManager->BroadcastEvent( ev );
......@@ -4125,7 +4125,7 @@ void CVACoreImpl::SetOutputMuted( const bool bMuted )
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_OUTPUT_MUTING_CHANGED;
ev.iEventType = CVAEvent::OUTPUT_MUTING_CHANGED;
ev.pSender = this;
ev.bMuted = m_bOutputMuted;
m_pEventManager->BroadcastEvent( ev );
......@@ -4164,7 +4164,7 @@ void CVACoreImpl::SetGlobalAuralizationMode( const int iAuralizationMode )
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_GLOBAL_AURALIZATION_MODE_CHANGED;
ev.iEventType = CVAEvent::GLOBAL_AURALIZATION_MODE_CHANGED;
ev.pSender = this;
ev.iAuralizationMode = iAuralizationMode;
m_pEventManager->BroadcastEvent( ev );
......@@ -4211,7 +4211,7 @@ void CVACoreImpl::SetActiveSoundReceiver( const int iListenerID )
// Ereignis generieren
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_ACTIVE_SOUND_RECEIVER_CHANGED;
ev.iEventType = CVAEvent::ACTIVE_SOUND_RECEIVER_CHANGED;
ev.pSender = this;
ev.iObjectID = iListenerID;
m_pEventManager->EnqueueEvent( ev );
......@@ -4810,7 +4810,7 @@ void CVACoreImpl::InitProgress( const std::string& sAction, const std::string& s
// Fortschritts-Ereignis senden
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_PROGRESS_UPDATE;
ev.iEventType = CVAEvent::PROGRESS_UPDATE;
ev.pSender = this;
ev.oProgress = m_Progress;
m_pEventManager->BroadcastEvent( ev );
......@@ -4828,7 +4828,7 @@ void CVACoreImpl::SetProgress( const std::string& sAction, const std::string& sS
// Fortschritts-Ereignis senden
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_PROGRESS_UPDATE;
ev.iEventType = CVAEvent::PROGRESS_UPDATE;
ev.pSender = this;
ev.oProgress = m_Progress;
m_pEventManager->BroadcastEvent( ev );
......@@ -4845,7 +4845,7 @@ void CVACoreImpl::FinishProgress()
// Fortschritts-Ereignis senden
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_PROGRESS_UPDATE;
ev.iEventType = CVAEvent::PROGRESS_UPDATE;
ev.pSender = this;
ev.oProgress = m_Progress;
m_pEventManager->BroadcastEvent( ev );
......@@ -4940,7 +4940,7 @@ void CVACoreImpl::CoreThreadLoop()
void CVACoreImpl::SendAudioDeviceDetectorUpdateEvent()
{
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_MEASURES_UPDATE;
ev.iEventType = CVAEvent::MEASURES_UPDATE;
ev.pSender = this;
if( m_pInputStreamDetector )
......@@ -4974,7 +4974,7 @@ void CVACoreImpl::SendRenderingModuleOutputDetectorsUpdateEvents()
CVAAudioRendererDesc& oRenderer( m_voRenderers[ i ] );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_MEASURES_UPDATE;
ev.iEventType = CVAEvent::MEASURES_UPDATE;
ev.pSender = this;
ev.sObjectID = oRenderer.sID;
ev.sParam = "RenderingModule"; // Use generic parameter slot to mark rendering module source
......@@ -4996,7 +4996,7 @@ void CVACoreImpl::SendReproductionModuleOIDetectorsUpdateEvents()
CVAAudioReproductionModuleDesc& oReproduction( m_voReproductionModules[ i ] );
CVAEvent ev;
ev.iEventType = CVAEvent::VA_EVENT_MEASURES_UPDATE;
ev.iEventType = CVAEvent::MEASURES_UPDATE;
ev.pSender = this;
ev.sObjectID = oReproduction.sID;
ev.sParam = "ReproductionModule"; // Use generic parameter slot to mark reproduction module source
......
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