Applying renaming of VA event ids

parent ff2470cc
......@@ -43,59 +43,59 @@ class VABASE_API CVAEvent
{
public:
static const uint64_t VA_EVENT_NOTHING = 0;
static const uint64_t VA_EVENT_INITIALIZED = VA_BIT64( 1 );
static const uint64_t VA_EVENT_FINALIZED = VA_BIT64( 2 );
static const uint64_t VA_EVENT_PROGRESS_UPDATE = VA_BIT64( 3 );
static const uint64_t VA_EVENT_DIRECTIVITY_LOADED = VA_BIT64( 4 );
static const uint64_t VA_EVENT_DIRECTIVITY_DELETED = VA_BIT64( 5 );
static const uint64_t VA_EVENT_SIGNALSOURCE_CREATED = VA_BIT64( 6 );
static const uint64_t VA_EVENT_SIGNALSOURCE_DELETED = VA_BIT64( 7 );
static const uint64_t VA_EVENT_SIGNALSOURCE_REGISTERED = VA_BIT64( 8 );
static const uint64_t VA_EVENT_SIGNALSOURCE_UNREGISTERED = VA_BIT64( 9 );
static const uint64_t VA_EVENT_SIGNALSOURCE_STATE_CHANGED = VA_BIT64( 10 );
static const uint64_t VA_EVENT_SAMPLE_LOADED = VA_BIT64( 11 );
static const uint64_t VA_EVENT_SAMPLE_FREED = VA_BIT64( 12 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CREATED = VA_BIT64( 13 );
static const uint64_t VA_EVENT_SOUND_SOURCE_DELETED = VA_BIT64( 14 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_NAME = VA_BIT64( 15 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE = VA_BIT64( 16 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE = VA_BIT64( 17 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_SOUND_POWER = VA_BIT64( 18 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_MUTING = VA_BIT64( 19 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_POSE = VA_BIT64( 20 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_CREATED = VA_BIT64( 21 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_DELETED = VA_BIT64( 22 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_CHANGED_NAME = VA_BIT64( 23 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE = VA_BIT64( 24 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_CHANGED_POSE = VA_BIT64( 25 );
static const uint64_t VA_EVENT_SOUND_PORTAL_CHANGED_NAME = VA_BIT64( 26 );
static const uint64_t VA_EVENT_SOUND_PORTAL_CHANGED_POSE = VA_BIT64( 27 );
static const uint64_t VA_EVENT_SOUND_PORTAL_CHANGED_PARAMETER = VA_BIT64( 41 );
static const uint64_t VA_EVENT_ACTIVE_SOUND_RECEIVER_CHANGED = VA_BIT64( 28 );
static const uint64_t VA_EVENT_INPUT_GAIN_CHANGED = VA_BIT64( 29 );
static const uint64_t VA_EVENT_INPUT_MUTING_CHANGED = VA_BIT64( 30 );
static const uint64_t VA_EVENT_OUTPUT_GAIN_CHANGED = VA_BIT64( 31 );
static const uint64_t VA_EVENT_OUTPUT_MUTING_CHANGED = VA_BIT64( 32 );
static const uint64_t VA_EVENT_GLOBAL_AURALIZATION_MODE_CHANGED = VA_BIT64( 33 );
static const uint64_t VA_EVENT_UNSPECIFIED_34 = VA_BIT64( 34 );
static const uint64_t VA_EVENT_UNSPECIFIED_35 = VA_BIT64( 35 );
static const uint64_t VA_EVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY = VA_BIT64( 36 );
static const uint64_t VA_EVENT_MEASURES_UPDATE = VA_BIT64( 37 );
static const uint64_t VA_EVENT_RESET = VA_BIT64( 38 );
static const uint64_t VA_EVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY = VA_BIT64( 39 );
static const uint64_t VA_EVENT_DESTROY = VA_BIT64( 40 );
static const uint64_t NOTHING = 0;
static const uint64_t INITIALIZED = VA_BIT64( 1 );
static const uint64_t FINALIZED = VA_BIT64( 2 );
static const uint64_t PROGRESS_UPDATE = VA_BIT64( 3 );
static const uint64_t DIRECTIVITY_LOADED = VA_BIT64( 4 );
static const uint64_t DIRECTIVITY_DELETED = VA_BIT64( 5 );
static const uint64_t SIGNALSOURCE_CREATED = VA_BIT64( 6 );
static const uint64_t SIGNALSOURCE_DELETED = VA_BIT64( 7 );
static const uint64_t SIGNALSOURCE_REGISTERED = VA_BIT64( 8 );
static const uint64_t SIGNALSOURCE_UNREGISTERED = VA_BIT64( 9 );
static const uint64_t SIGNALSOURCE_STATE_CHANGED = VA_BIT64( 10 );
static const uint64_t SAMPLE_LOADED = VA_BIT64( 11 );
static const uint64_t SAMPLE_FREED = VA_BIT64( 12 );
static const uint64_t SOUND_SOURCE_CREATED = VA_BIT64( 13 );
static const uint64_t SOUND_SOURCE_DELETED = VA_BIT64( 14 );
static const uint64_t SOUND_SOURCE_CHANGED_NAME = VA_BIT64( 15 );
static const uint64_t SOUND_SOURCE_CHANGED_SIGNALSOURCE = VA_BIT64( 16 );
static const uint64_t SOUND_SOURCE_CHANGED_AURALIZATIONMODE = VA_BIT64( 17 );
static const uint64_t SOUND_SOURCE_CHANGED_SOUND_POWER = VA_BIT64( 18 );
static const uint64_t SOUND_SOURCE_CHANGED_MUTING = VA_BIT64( 19 );
static const uint64_t SOUND_SOURCE_CHANGED_POSE = VA_BIT64( 20 );
static const uint64_t SOUND_RECEIVER_CREATED = VA_BIT64( 21 );
static const uint64_t SOUND_RECEIVER_DELETED = VA_BIT64( 22 );
static const uint64_t SOUND_RECEIVER_CHANGED_NAME = VA_BIT64( 23 );
static const uint64_t SOUND_RECEIVER_CHANGED_AURALIZATIONMODE = VA_BIT64( 24 );
static const uint64_t SOUND_RECEIVER_CHANGED_POSE = VA_BIT64( 25 );
static const uint64_t SOUND_PORTAL_CHANGED_NAME = VA_BIT64( 26 );
static const uint64_t SOUND_PORTAL_CHANGED_POSE = VA_BIT64( 27 );
static const uint64_t SOUND_PORTAL_CHANGED_PARAMETER = VA_BIT64( 41 );
static const uint64_t ACTIVE_SOUND_RECEIVER_CHANGED = VA_BIT64( 28 );
static const uint64_t INPUT_GAIN_CHANGED = VA_BIT64( 29 );
static const uint64_t INPUT_MUTING_CHANGED = VA_BIT64( 30 );
static const uint64_t OUTPUT_GAIN_CHANGED = VA_BIT64( 31 );
static const uint64_t OUTPUT_MUTING_CHANGED = VA_BIT64( 32 );
static const uint64_t GLOBAL_AURALIZATION_MODE_CHANGED = VA_BIT64( 33 );
static const uint64_t UNSPECIFIED_34 = VA_BIT64( 34 );
static const uint64_t UNSPECIFIED_35 = VA_BIT64( 35 );
static const uint64_t SOUND_RECEIVER_CHANGED_DIRECTIVITY = VA_BIT64( 36 );
static const uint64_t MEASURES_UPDATE = VA_BIT64( 37 );
static const uint64_t RESET = VA_BIT64( 38 );
static const uint64_t SOUND_SOURCE_CHANGED_DIRECTIVITY = VA_BIT64( 39 );
static const uint64_t DESTROY = VA_BIT64( 40 );
static const uint64_t SOUND_SOURCE_REAL_WORLD_POSE_CHANGED = VA_BIT64( 41 );
static const uint64_t SOUND_RECEIVER_REAL_WORLD_POSE_CHANGED = VA_BIT64( 42 );
......@@ -103,51 +103,51 @@ public:
// Next free slot: 43
//!< Selector mask for signal source related events
static const uint64_t VA_EVENT_SIGNALSOURCE_EVENT = VA_EVENT_SIGNALSOURCE_CREATED |
VA_EVENT_SIGNALSOURCE_DELETED |
VA_EVENT_SIGNALSOURCE_REGISTERED |
VA_EVENT_SIGNALSOURCE_UNREGISTERED |
VA_EVENT_SIGNALSOURCE_STATE_CHANGED |
VA_EVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE;
static const uint64_t SIGNALSOURCE_EVENT = SIGNALSOURCE_CREATED |
SIGNALSOURCE_DELETED |
SIGNALSOURCE_REGISTERED |
SIGNALSOURCE_UNREGISTERED |
SIGNALSOURCE_STATE_CHANGED |
SOUND_SOURCE_CHANGED_SIGNALSOURCE;
//!< Selector mask for sound source related events
static const uint64_t VA_EVENT_SOUNDSOURCE_EVENT = VA_EVENT_SOUND_SOURCE_CREATED |
VA_EVENT_SOUND_SOURCE_DELETED |
VA_EVENT_SOUND_SOURCE_CHANGED_NAME |
VA_EVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE |
VA_EVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE |
VA_EVENT_SOUND_SOURCE_CHANGED_SOUND_POWER |
VA_EVENT_SOUND_SOURCE_CHANGED_MUTING |
VA_EVENT_SOUND_SOURCE_CHANGED_POSE |
VA_EVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY;
static const uint64_t SOUNDSOURCE_EVENT = SOUND_SOURCE_CREATED |
SOUND_SOURCE_DELETED |
SOUND_SOURCE_CHANGED_NAME |
SOUND_SOURCE_CHANGED_SIGNALSOURCE |
SOUND_SOURCE_CHANGED_AURALIZATIONMODE |
SOUND_SOURCE_CHANGED_SOUND_POWER |
SOUND_SOURCE_CHANGED_MUTING |
SOUND_SOURCE_CHANGED_POSE |
SOUND_SOURCE_CHANGED_DIRECTIVITY;
//!< Selector mask for sound receiver related events
static const uint64_t VA_EVENT_SOUND_RECEIVER_EVENT = VA_EVENT_SOUND_RECEIVER_CREATED |
VA_EVENT_SOUND_RECEIVER_DELETED |
VA_EVENT_SOUND_RECEIVER_CHANGED_NAME |
VA_EVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE |
VA_EVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY |
VA_EVENT_SOUND_RECEIVER_CHANGED_POSE;
static const uint64_t SOUND_RECEIVER_EVENT = SOUND_RECEIVER_CREATED |
SOUND_RECEIVER_DELETED |
SOUND_RECEIVER_CHANGED_NAME |
SOUND_RECEIVER_CHANGED_AURALIZATIONMODE |
SOUND_RECEIVER_CHANGED_DIRECTIVITY |
SOUND_RECEIVER_CHANGED_POSE;
//!< Selector mask for portal related events
static const uint64_t VA_EVENT_PORTAL_EVENT = VA_EVENT_SOUND_PORTAL_CHANGED_NAME |
VA_EVENT_SOUND_PORTAL_CHANGED_PARAMETER;
static const uint64_t PORTAL_EVENT = SOUND_PORTAL_CHANGED_NAME |
SOUND_PORTAL_CHANGED_PARAMETER;
//!< Selector mask for sound source modification event
static const uint64_t VA_EVENT_SOUNDSOURCE_MODIFICATION = VA_EVENT_SOUND_SOURCE_CHANGED_NAME |
VA_EVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE |
VA_EVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE |
VA_EVENT_SOUND_SOURCE_CHANGED_SOUND_POWER |
VA_EVENT_SOUND_SOURCE_CHANGED_MUTING |
VA_EVENT_SOUND_SOURCE_CHANGED_POSE |
VA_EVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY;
static const uint64_t SOUNDSOURCE_MODIFICATION = SOUND_SOURCE_CHANGED_NAME |
SOUND_SOURCE_CHANGED_SIGNALSOURCE |
SOUND_SOURCE_CHANGED_AURALIZATIONMODE |
SOUND_SOURCE_CHANGED_SOUND_POWER |
SOUND_SOURCE_CHANGED_MUTING |
SOUND_SOURCE_CHANGED_POSE |
SOUND_SOURCE_CHANGED_DIRECTIVITY;
//!< Selector mask for sound receiver modification event
static const uint64_t VA_EVENT_SOUND_RECEIVER_MODIFICATION = VA_EVENT_SOUND_RECEIVER_CHANGED_NAME |
VA_EVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE |
VA_EVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY |
VA_EVENT_SOUND_RECEIVER_CHANGED_POSE;
static const uint64_t SOUND_RECEIVER_MODIFICATION = SOUND_RECEIVER_CHANGED_NAME |
SOUND_RECEIVER_CHANGED_AURALIZATIONMODE |
SOUND_RECEIVER_CHANGED_DIRECTIVITY |
SOUND_RECEIVER_CHANGED_POSE;
IVAInterface* pSender; //!< Sender interface
......
......@@ -24,148 +24,148 @@ std::string CVAEvent::ToString() const
switch( iEventType )
{
case VA_EVENT_NOTHING:
case NOTHING:
ss << "Nothing";
break;
case VA_EVENT_INITIALIZED:
case INITIALIZED:
ss << "Core " << pSender << " initialized";
break;
case VA_EVENT_PROGRESS_UPDATE:
case PROGRESS_UPDATE:
ss << "Core " << pSender << " progress update";
break;
case VA_EVENT_RESET:
case RESET:
ss << "Core reset";
break;
case VA_EVENT_FINALIZED:
case FINALIZED:
ss << "Core " << pSender << " finalized";
break;
case VA_EVENT_DIRECTIVITY_LOADED:
case DIRECTIVITY_LOADED:
ss << "Directivity loaded (ID = " << iObjectID << ")";
break;
case VA_EVENT_DIRECTIVITY_DELETED:
case DIRECTIVITY_DELETED:
ss << "Directivity " << iObjectID << " freed";
break;
case VA_EVENT_SIGNALSOURCE_CREATED:
case SIGNALSOURCE_CREATED:
ss << "Signal source created (ID = " << sObjectID << ")";
break;
case VA_EVENT_SIGNALSOURCE_DELETED:
case SIGNALSOURCE_DELETED:
ss << "Signal source " << sObjectID << " deleted";
break;
case VA_EVENT_SAMPLE_LOADED:
case SAMPLE_LOADED:
ss << "Sample loaded (ID = " << iObjectID << ")";
break;
case VA_EVENT_SAMPLE_FREED:
case SAMPLE_FREED:
ss << "Sample " << iObjectID << " freed";
break;
case VA_EVENT_SOUND_SOURCE_CREATED:
case SOUND_SOURCE_CREATED:
ss << "Sound source created (ID = " << iObjectID
<< ", amode = " << IVAInterface::GetAuralizationModeStr( iAuralizationMode )
<< ", volume = " << IVAInterface::GetVolumeStrDecibel( dVolume ) << ")";
break;
case VA_EVENT_SOUND_SOURCE_DELETED:
case SOUND_SOURCE_DELETED:
ss << "Sound source " << iObjectID << " deleted";
break;
case VA_EVENT_SOUND_SOURCE_CHANGED_NAME:
case SOUND_SOURCE_CHANGED_NAME:
ss << "Sound source " << iObjectID << " changed name to \"" << sName << "\"";
break;
case VA_EVENT_SOUND_SOURCE_CHANGED_SIGNALSOURCE:
case SOUND_SOURCE_CHANGED_SIGNALSOURCE:
ss << "Sound source " << iObjectID << " changed signal source to \"" << sParam << "\"";
break;
case VA_EVENT_SOUND_SOURCE_CHANGED_AURALIZATIONMODE:
case SOUND_SOURCE_CHANGED_AURALIZATIONMODE:
ss << "Sound source " << iObjectID << " changed auralization mode to " << IVAInterface::GetAuralizationModeStr( iAuralizationMode );
break;
case VA_EVENT_SOUND_SOURCE_CHANGED_SOUND_POWER:
case SOUND_SOURCE_CHANGED_SOUND_POWER:
ss << "Sound source " << iObjectID << " changed volume to " << IVAInterface::GetVolumeStrDecibel( dVolume );
break;
case VA_EVENT_SOUND_SOURCE_CHANGED_MUTING:
case SOUND_SOURCE_CHANGED_MUTING:
ss << "Sound source " << iObjectID << ( bMuted ? " muted" : " unmuted" );
break;
case VA_EVENT_SOUND_SOURCE_CHANGED_POSE:
case SOUND_SOURCE_CHANGED_POSE:
ss << "Sound source " << iObjectID << " changed position orientation" << std::endl
<< "P=" << vPos << ", "
<< "V=" << vView << ", "
<< "U=" << vUp;
break;
case VA_EVENT_SOUND_SOURCE_CHANGED_DIRECTIVITY:
case SOUND_SOURCE_CHANGED_DIRECTIVITY:
ss << "Sound source " << iObjectID << " changed directivity to " << iParamID;
break;
case VA_EVENT_SOUND_RECEIVER_CREATED:
case SOUND_RECEIVER_CREATED:
ss << "Sound receiver created (ID = " << iObjectID
<< ", amode = " << IVAInterface::GetAuralizationModeStr( iAuralizationMode ) << ")";
break;
case VA_EVENT_SOUND_RECEIVER_DELETED:
case SOUND_RECEIVER_DELETED:
ss << "Sound receiver " << iObjectID << " deleted";
break;
case VA_EVENT_SOUND_RECEIVER_CHANGED_NAME:
case SOUND_RECEIVER_CHANGED_NAME:
ss << "Sound receiver " << iObjectID << " changed name to \"" << sName << "\"";
break;
case VA_EVENT_SOUND_RECEIVER_CHANGED_AURALIZATIONMODE:
case SOUND_RECEIVER_CHANGED_AURALIZATIONMODE:
ss << "Sound receiver " << iObjectID << " changed auralization mode to " << IVAInterface::GetAuralizationModeStr( iAuralizationMode );
break;
case VA_EVENT_SOUND_RECEIVER_CHANGED_DIRECTIVITY:
case SOUND_RECEIVER_CHANGED_DIRECTIVITY:
ss << "Sound receiver " << iObjectID << " is assigned HRIR dataset " << iParamID;
break;
case VA_EVENT_SOUND_RECEIVER_CHANGED_POSE:
case SOUND_RECEIVER_CHANGED_POSE:
ss << "Sound receiver " << iObjectID << " changed position orientation" << std::endl
<< "P=" << vPos << ", "
<< "V=" << vView << ", "
<< "U=" << vUp;
break;
case VA_EVENT_SOUND_PORTAL_CHANGED_NAME:
case SOUND_PORTAL_CHANGED_NAME:
ss << "Portal " << iObjectID << " changed name to \"" << sName << "\"";
break;
case VA_EVENT_SOUND_PORTAL_CHANGED_PARAMETER:
case SOUND_PORTAL_CHANGED_PARAMETER:
ss << "Portal " << iObjectID << " changed state to \"" << std::setprecision( 3 ) << std::fixed << dState << "\"";
break;
case VA_EVENT_ACTIVE_SOUND_RECEIVER_CHANGED:
case ACTIVE_SOUND_RECEIVER_CHANGED:
ss << "Sound receiver " << iObjectID << " set as active sound receiver";
break;
case VA_EVENT_INPUT_GAIN_CHANGED:
case INPUT_GAIN_CHANGED:
ss << "Gain of input " << iIndex << " set to " << IVAInterface::GetVolumeStrDecibel( dVolume );
break;
case VA_EVENT_OUTPUT_GAIN_CHANGED:
case OUTPUT_GAIN_CHANGED:
ss << "Output gain set to " << IVAInterface::GetVolumeStrDecibel( dVolume );
break;
case VA_EVENT_OUTPUT_MUTING_CHANGED:
case OUTPUT_MUTING_CHANGED:
ss << "Global muting " << ( bMuted ? "enabled" : "disabled" );
break;
case VA_EVENT_GLOBAL_AURALIZATION_MODE_CHANGED:
case GLOBAL_AURALIZATION_MODE_CHANGED:
ss << "Global auralization mode set to " << IVAInterface::GetAuralizationModeStr( iAuralizationMode );
break;
case VA_EVENT_MEASURES_UPDATE:
case MEASURES_UPDATE:
/* TODO:
ss << "Audiostream peaks update: inputs=(" << FloatVecToString(vfInputPeaks, 3)
<< "), outputs=(" << FloatVecToString(vfOutputPeaks, 3) << ")";
......
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