Minor extensions

parent 6fdb0d7b
......@@ -50,7 +50,7 @@ public:
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_FREED = VA_BIT64( 5 );
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 );
......@@ -77,16 +77,16 @@ public:
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_PORTAL_CHANGED_NAME = VA_BIT64( 26 );
static const uint64_t VA_EVENT_PORTAL_CHANGED_POSE = VA_BIT64( 27 );
static const uint64_t VA_EVENT_PORTAL_CHANGED_PARAMETER = VA_BIT64( 41 );
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_INPUTGAIN_CHANGED = VA_BIT64( 29 );
static const uint64_t VA_EVENT_INPUTMUTING_CHANGED = VA_BIT64( 30 );
static const uint64_t VA_EVENT_OUTPUTGAIN_CHANGED = VA_BIT64( 31 );
static const uint64_t VA_EVENT_OUTPUTMUTING_CHANGED = VA_BIT64( 32 );
static const uint64_t VA_EVENT_GLOBALAURALIZATIONMODE_CHANGED = VA_BIT64( 33 );
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 );
......@@ -127,8 +127,8 @@ public:
VA_EVENT_SOUND_RECEIVER_CHANGED_POSE;
//!< Selector mask for portal related events
static const uint64_t VA_EVENT_PORTAL_EVENT = VA_EVENT_PORTAL_CHANGED_NAME |
VA_EVENT_PORTAL_CHANGED_PARAMETER;
static const uint64_t VA_EVENT_PORTAL_EVENT = VA_EVENT_SOUND_PORTAL_CHANGED_NAME |
VA_EVENT_SOUND_PORTAL_CHANGED_PARAMETER;
//!< Selector mask for sound source modification event
......
......@@ -81,6 +81,8 @@ protected:
#define VA_EXCEPT1(ERRRORMSG) { throw CVAException(CVAException::UNSPECIFIED, (ERRRORMSG) ); }
#define VA_EXCEPT2(ERRORCODE, ERRRORMSG) { throw CVAException( (CVAException::ERRORCODE) , (ERRRORMSG) ); }
#define VA_EXCEPT_NOT_IMPLEMENTED { throw CVAException( (CVAException::NOT_IMPLEMENTED) , "Not implemented" ); }
#define VA_EXCEPT_NOT_IMPLEMENTED_NEXT_VERSION { throw CVAException( (CVAException::NOT_IMPLEMENTED) , "This method has not been newly introduced to the VA interface, but will be implemented in the next core version" ); }
#define VA_EXCEPT_NOT_IMPLEMENTED_FUTURE_VERSION { throw CVAException( (CVAException::NOT_IMPLEMENTED) , "This method has not been introduced to the VA interface for future use and is currently not available in the core" ); }
//! STL stream output operator
/**
......
......@@ -48,7 +48,7 @@ std::string CVAEvent::ToString() const
ss << "Directivity loaded (ID = " << iObjectID << ")";
break;
case VA_EVENT_DIRECTIVITY_FREED:
case VA_EVENT_DIRECTIVITY_DELETED:
ss << "Directivity " << iObjectID << " freed";
break;
......@@ -137,11 +137,11 @@ std::string CVAEvent::ToString() const
<< "U=" << vUp;
break;
case VA_EVENT_PORTAL_CHANGED_NAME:
case VA_EVENT_SOUND_PORTAL_CHANGED_NAME:
ss << "Portal " << iObjectID << " changed name to \"" << sName << "\"";
break;
case VA_EVENT_PORTAL_CHANGED_PARAMETER:
case VA_EVENT_SOUND_PORTAL_CHANGED_PARAMETER:
ss << "Portal " << iObjectID << " changed state to \"" << std::setprecision( 3 ) << std::fixed << dState << "\"";
break;
......@@ -149,19 +149,19 @@ std::string CVAEvent::ToString() const
ss << "Sound receiver " << iObjectID << " set as active sound receiver";
break;
case VA_EVENT_INPUTGAIN_CHANGED:
case VA_EVENT_INPUT_GAIN_CHANGED:
ss << "Gain of input " << iIndex << " set to " << IVAInterface::GetVolumeStrDecibel( dVolume );
break;
case VA_EVENT_OUTPUTGAIN_CHANGED:
case VA_EVENT_OUTPUT_GAIN_CHANGED:
ss << "Output gain set to " << IVAInterface::GetVolumeStrDecibel( dVolume );
break;
case VA_EVENT_OUTPUTMUTING_CHANGED:
case VA_EVENT_OUTPUT_MUTING_CHANGED:
ss << "Global muting " << ( bMuted ? "enabled" : "disabled" );
break;
case VA_EVENT_GLOBALAURALIZATIONMODE_CHANGED:
case VA_EVENT_GLOBAL_AURALIZATION_MODE_CHANGED:
ss << "Global auralization mode set to " << IVAInterface::GetAuralizationModeStr( iAuralizationMode );
break;
......
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