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

Fixing problems with new interface, now all methods are available to the...

Fixing problems with new interface, now all methods are available to the client side and require network protocoll implementations
parent 4361734a
......@@ -445,7 +445,7 @@ public:
m_pProtocol->ClientSetSoundSourceAuralizationMode( iSoundSourceID, iAuralizationMode );
};
inline CVAStruct GetSoundSourceParameters( int iID, const CVAStruct& oArgs ) const
inline CVAStruct GetSoundSourceParameters( const int iID, const CVAStruct& oArgs ) const
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
......@@ -612,12 +612,12 @@ public:
return m_pProtocol->ClientDeleteSoundReceiver( iSoundReceiverID );
};
inline void SetSoundReceiverEnabled( int iSoundReceiverID, bool bEnabled = true )
inline void SetSoundReceiverEnabled( const int iSoundReceiverID, const bool bEnabled = true )
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientSetSoundReceiverEnabled( iSoundReceiverID, bEnabled );
}
};
inline bool GetSoundReceiverEnabled( const int iSoundReceiverID ) const
{
......@@ -631,13 +631,14 @@ public:
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientGetSoundReceiverName( iSoundReceiverID );
}
};
inline void SetSoundReceiverName( int iSoundReceiverID, const std::string& sName ) {
inline void SetSoundReceiverName( const int iSoundReceiverID, const std::string& sName )
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
m_pProtocol->ClientSetSoundReceiverName( iSoundReceiverID, sName );
}
};
inline int GetSoundReceiverAuralizationMode( const int iSoundReceiverID ) const
{
......@@ -1136,35 +1137,35 @@ public:
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
m_pProtocol->ClientGetRenderingModuleInfos( voRenderer, bFilterEnabled );
}
};
inline void SetRenderingModuleMuted( const std::string& sModuleID, const bool bMuted = true )
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
m_pProtocol->ClientSetRenderingModuleMuted( sModuleID, bMuted );
}
};
inline bool GetRenderingModuleMuted( const std::string& sModuleID ) const
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientIsRenderingModuleMuted( sModuleID );
}
};
inline void SetRenderingModuleGain( const std::string& sModuleID, const double dGain )
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
m_pProtocol->ClientSetRenderingModuleGain( sModuleID, dGain );
}
};
inline double GetRenderingModuleGain( const std::string& sModuleID ) const
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientGetRenderingModuleGain( sModuleID );
}
};
inline void GetReproductionModules( std::vector< CVAAudioReproductionInfo >& voRepros, const bool bFilterEnabled = true ) const
{
......@@ -1178,28 +1179,28 @@ public:
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
m_pProtocol->ClientSetReproductionModuleMuted( sModuleID, bMuted );
}
};
inline bool IsReproductionModuleMuted( const std::string& sModuleID ) const
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientIsReproductionModuleMuted( sModuleID );
}
};
inline void SetReproductionModuleGain( const std::string& sModuleID, const double dGain )
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
m_pProtocol->ClientSetReproductionModuleGain( sModuleID, dGain );
}
};
inline double GetReproductionModuleGain( const std::string& sModuleID ) const
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientGetReproductionModuleGain( sModuleID );
}
};
inline int CreateAcousticMaterial( const CVAAcousticMaterial& oMaterial, const std::string& sName = "" )
{
......
......@@ -753,6 +753,22 @@ void CVANetMessage::WriteAudioReproductionModuleInfo( const CVAAudioReproduction
WriteString( oRepro.sDescription );
}
void CVANetMessage::WriteSoundSourceInfo( const CVASoundSourceInfo& oInfo )
{
WriteBool( oInfo.bMuted );
WriteDouble( oInfo.dSpoundPower );
WriteInt( oInfo.iAuraMode );
WriteInt( oInfo.iDirectivityID );
WriteInt( oInfo.iID );
WriteInt( oInfo.iSignalSourceID );
WriteVAStruct( oInfo.oParams );
WriteQuat( oInfo.qOrient );
WriteString( oInfo.sName );
WriteVec3( oInfo.v3Pos );
WriteVec3( oInfo.v3Up );
WriteVec3( oInfo.v3View );
}
CVAAudioRendererInfo CVANetMessage::ReadAudioRenderingModuleInfo()
{
CVAAudioRendererInfo oRenderer;
......@@ -772,3 +788,21 @@ CVAAudioReproductionInfo CVANetMessage::ReadAudioReproductionModuleInfo()
oRepro.sDescription = ReadString();
return oRepro;
}
CVASoundSourceInfo CVANetMessage::ReadSoundSourceInfo()
{
CVASoundSourceInfo oInfo;
oInfo.bMuted = ReadBool();
oInfo.dSpoundPower = ReadDouble();
oInfo.iAuraMode = ReadInt();
oInfo.iDirectivityID = ReadInt();
oInfo.iID = ReadInt();
oInfo.iSignalSourceID = ReadInt();
ReadVAStruct( oInfo.oParams );
oInfo.qOrient = ReadQuat();
oInfo.sName = ReadString();
oInfo.v3Pos = ReadVec3();
oInfo.v3Up = ReadVec3();
oInfo.v3View = ReadVec3();
return oInfo;
}
\ No newline at end of file
......@@ -87,6 +87,7 @@ public:
void WriteVAStruct( const CVAStruct& oStruct );
void WriteAudioRenderingModuleInfo( const CVAAudioRendererInfo& );
void WriteAudioReproductionModuleInfo( const CVAAudioReproductionInfo& );
void WriteSoundSourceInfo( const CVASoundSourceInfo& oInfo );
std::string ReadString();
int ReadInt();
......@@ -107,6 +108,7 @@ public:
void ReadVAStruct( CVAStruct& oStruct );
CVAAudioRendererInfo ReadAudioRenderingModuleInfo();
CVAAudioReproductionInfo ReadAudioReproductionModuleInfo();
CVASoundSourceInfo ReadSoundSourceInfo();
VistaConnectionIP* GetConnection() const;
void ClearConnection();
......
......@@ -633,12 +633,9 @@ void CVANetNetworkProtocol::ClientGetModules( std::vector<CVAModuleInfo>& m_viMo
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_MODULES, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
int nModules = pMsg->ReadInt();
const int nModules = pMsg->ReadInt();
m_viModuleInfos.clear();
m_viModuleInfos.resize( nModules );
for( int i = 0; i < nModules; i++ )
pMsg->ReadModuleInfo( m_viModuleInfos[ i ] );
}
......@@ -646,26 +643,37 @@ void CVANetNetworkProtocol::ClientGetModules( std::vector<CVAModuleInfo>& m_viMo
void CVANetNetworkProtocol::ServerGetModules()
{
CVANetMessage* pMsg = ServerGetMessage();
std::vector<CVAModuleInfo> viModules;
m_pRealCore->GetModules( viModules );
pMsg->WriteInt( ( int ) viModules.size() );
for( int i = 0; i < ( int ) viModules.size(); i++ )
pMsg->WriteModuleInfo( viModules[ i ] );
}
CVAStruct CVANetNetworkProtocol::ClientGetSearchPaths()
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SEARCH_PATHS, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
CVAStruct oPaths;
pMsg->ReadVAStruct( oPaths );
return oPaths;
}
void CVANetNetworkProtocol::ServerGetSearchPaths()
{
CVANetMessage* pMsg = ServerGetMessage();
const CVAStruct oPaths = m_pRealCore->GetSearchPaths();
pMsg->WriteVAStruct( oPaths );
}
CVAStruct CVANetNetworkProtocol::ClientCallModule( const std::string& sModuleName, const CVAStruct& oArgs )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CALL_MODULE, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sModuleName );
pMsg->WriteVAStruct( oArgs );
ClientSendCommand( pMsg );
CVAStruct oReturn;
pMsg->ReadVAStruct( oReturn );
return oReturn;
}
......@@ -723,7 +731,7 @@ void CVANetNetworkProtocol::ServerDeleteDirectivity()
pMsg->WriteBool( bRes );
}
CVADirectivityInfo CVANetNetworkProtocol::ClientGetDirectivityInfo( int iDirID )
CVADirectivityInfo CVANetNetworkProtocol::ClientGetDirectivityInfo( const int iDirID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_DIRECTIVITY_INFO, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iDirID );
......@@ -748,11 +756,9 @@ void CVANetNetworkProtocol::ServerGetDirectivityInfo()
void CVANetNetworkProtocol::ClientGetDirectivityInfos( std::vector<CVADirectivityInfo>& vdiDest )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_DIRECTIVITY_INFOS, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
vdiDest.clear();
int iNumDirectivities = pMsg->ReadInt();
const int iNumDirectivities = pMsg->ReadInt();
for( int i = 0; i < iNumDirectivities; i++ )
vdiDest.push_back( pMsg->ReadDirectivityInfo() );
}
......@@ -760,37 +766,101 @@ void CVANetNetworkProtocol::ClientGetDirectivityInfos( std::vector<CVADirectivit
void CVANetNetworkProtocol::ServerGetDirectivityInfos()
{
CVANetMessage* pMsg = ServerGetMessage();
std::vector<CVADirectivityInfo> vInfos;
m_pRealCore->GetDirectivityInfos( vInfos );
pMsg->WriteInt( ( int ) vInfos.size() );
for( size_t i = 0; i < vInfos.size(); i++ )
pMsg->WriteDirectivityInfo( vInfos[ i ] );
}
std::string CVANetNetworkProtocol::ClientCreateSignalSourceBufferFromParameters( const CVAStruct& oParams, const std::string& sName )
void CVANetNetworkProtocol::ClientSetDirectivityName( const int iID, const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_SIGNAL_SOURCE_BUFFER_FROM_PARAMETERS, MESSAGE_WITH_ANSWER );
pMsg->WriteVAStruct( oParams );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_DIRECTIVITY_NAME, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteInt( iID );
pMsg->WriteString( sName );
ClientSendCommand( pMsg );
}
void CVANetNetworkProtocol::ServerSetDirectivityName()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
const std::string sName = pMsg->ReadString();
m_pRealCore->SetDirectivityName( iID, sName );
}
std::string CVANetNetworkProtocol::ClientGetDirectivityName( const int iID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_DIRECTIVITY_NAME, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iID );
ClientSendCommand( pMsg );
const std::string sName = pMsg->ReadString();
return sName;
}
return pMsg->ReadString();
void CVANetNetworkProtocol::ServerGetDirectivityName()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
const std::string sName = m_pRealCore->GetDirectivityName( iID );
pMsg->WriteString( sName );
}
void CVANetNetworkProtocol::ServerCreateSignalSourceBufferFromParameters()
void CVANetNetworkProtocol::ClientSetDirectivityParameters( const int iID, const CVAStruct& oParams )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_DIRECTIVITY_PARAMETERS, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteInt( iID );
pMsg->WriteVAStruct( oParams );
ClientSendCommand( pMsg );
}
void CVANetNetworkProtocol::ServerSetDirectivityParameters()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
CVAStruct oParams;
pMsg->ReadVAStruct( oParams );
m_pRealCore->SetDirectivityParameters( iID, oParams );
}
CVAStruct CVANetNetworkProtocol::ClientGetDirectivityParameters( const int iID, const CVAStruct& oParams )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_DIRECTIVITY_PARAMETERS, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iID );
pMsg->WriteVAStruct( oParams );
ClientSendCommand( pMsg );
CVAStruct oReturn;
pMsg->ReadVAStruct( oReturn );
return oReturn;
}
void CVANetNetworkProtocol::ServerGetDirectivityParameters()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
CVAStruct oParams;
pMsg->ReadVAStruct( oParams );
std::string sName = pMsg->ReadString();
const CVAStruct oReturn = m_pRealCore->GetDirectivityParameters( iID, oParams );
pMsg->WriteVAStruct( oReturn );
}
std::string sID = m_pRealCore->CreateSignalSourceBufferFromParameters( oParams, sName );
std::string CVANetNetworkProtocol::ClientCreateSignalSourceBufferFromParameters( const CVAStruct& oParams, const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_SIGNAL_SOURCE_BUFFER_FROM_PARAMETERS, MESSAGE_WITH_ANSWER );
pMsg->WriteVAStruct( oParams );
pMsg->WriteString( sName );
ClientSendCommand( pMsg );
return pMsg->ReadString();
}
void CVANetNetworkProtocol::ServerCreateSignalSourceBufferFromParameters()
{
CVANetMessage* pMsg = ServerGetMessage();
CVAStruct oParams;
pMsg->ReadVAStruct( oParams );
const std::string sName = pMsg->ReadString();
const std::string sID = m_pRealCore->CreateSignalSourceBufferFromParameters( oParams, sName );
pMsg->WriteString( sID );
}
......@@ -1241,6 +1311,22 @@ void CVANetNetworkProtocol::ServerGetSoundSourceEnabled()
}
CVASoundSourceInfo CVANetNetworkProtocol::ClientGetSoundSourceInfo( const int iID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_SOURCE_INFO, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iID );
ClientSendCommand( pMsg );
return pMsg->ReadSoundSourceInfo();
}
void CVANetNetworkProtocol::ServerGetSoundSourceInfo()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
const CVASoundSourceInfo oInfo = m_pRealCore->GetSoundSourceInfo( iID );
pMsg->WriteSoundSourceInfo( oInfo );
}
void CVANetNetworkProtocol::ClientSetSoundSourceName( const int iSoundSourceID, const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_SOUNDSOURCE_NAME, MESSAGE_ALLOWS_BUFFERING );
......@@ -1942,6 +2028,145 @@ void CVANetNetworkProtocol::ServerSetSoundReceiverDirectivity()
m_pRealCore->SetSoundReceiverDirectivity( iID, iDirectivity );
}
void CVANetNetworkProtocol::ClientGetSoundReceiverPose( const int iID, VAVec3& v3Pos, VAQuat& qOrient )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_RECEIVER_POSE, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iID );
ClientSendCommand( pMsg );
v3Pos = pMsg->ReadVec3();
qOrient = pMsg->ReadQuat();
}
void CVANetNetworkProtocol::ServerGetSoundReceiverPose()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
const VAVec3 v3Pos = pMsg->ReadVec3();
const VAQuat qOrient = pMsg->ReadQuat();
m_pRealCore->SetSoundReceiverPose( iID, v3Pos, qOrient );
}
void CVANetNetworkProtocol::ClientSetSoundReceiverPose( const int iID, const VAVec3& v3Pos, const VAQuat& qOrient )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_SOUND_RECEIVER_POSE, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteInt( iID );
pMsg->WriteVec3( v3Pos );
pMsg->WriteQuat( qOrient );
ClientSendCommand( pMsg );
}
void CVANetNetworkProtocol::ServerSetSoundReceiverPose()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
VAVec3 v3Pos;
VAQuat qOrient;
m_pRealCore->GetSoundReceiverPose( iID, v3Pos, qOrient );
pMsg->WriteVec3( v3Pos );
pMsg->WriteQuat( qOrient );
}
VAVec3 CVANetNetworkProtocol::ClientGetSoundReceiverPosition( const int iID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_RECEIVER_POSITION, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteInt( iID );
ClientSendCommand( pMsg );
return pMsg->ReadVec3();
}
void CVANetNetworkProtocol::ServerGetSoundReceiverPosition()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
const VAVec3 v3Pos = m_pRealCore->GetSoundReceiverPosition( iID );
pMsg->WriteVec3( v3Pos );
}
void CVANetNetworkProtocol::ClientSetSoundReceiverPosition( const int iID, const VAVec3& v3Pos )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_SOUND_RECEIVER_POSITION, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteInt( iID );
pMsg->WriteVec3( v3Pos );
ClientSendCommand( pMsg );
}
void CVANetNetworkProtocol::ServerSetSoundReceiverPosition()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
const VAVec3 v3Pos = pMsg->ReadVec3();
m_pRealCore->SetSoundReceiverPosition( iID, v3Pos );
}
VAQuat CVANetNetworkProtocol::ClientGetSoundReceiverOrientation( const int iID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_RECEIVER_ORIENTATION, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteInt( iID );
ClientSendCommand( pMsg );
return pMsg->ReadQuat();
}
void CVANetNetworkProtocol::ServerGetSoundReceiverOrientation()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
const VAQuat qOrient = m_pRealCore->GetSoundReceiverOrientation( iID );
pMsg->WriteQuat( qOrient );
}
void CVANetNetworkProtocol::ClientSetSoundReceiverOrientation( const int iID, const VAQuat& qOrient )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_SOUND_RECEIVER_ORIENTATION, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteInt( iID );
pMsg->WriteQuat( qOrient );
ClientSendCommand( pMsg );
}
void CVANetNetworkProtocol::ServerSetSoundReceiverOrientation()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
const VAQuat qOrient = pMsg->ReadQuat();
m_pRealCore->SetSoundReceiverOrientation( iID, qOrient );
}
void CVANetNetworkProtocol::ClientGetSoundReceiverOrientationVU( const int iID, VAVec3& v3View, VAVec3& v3Up )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_RECEIVER_ORIENTATION_VU, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iID );
ClientSendCommand( pMsg );
v3View = pMsg->ReadVec3();
v3Up = pMsg->ReadVec3();
}
void CVANetNetworkProtocol::ServerGetSoundReceiverOrientationVU()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
VAVec3 v3View, v3Up;
m_pRealCore->GetSoundReceiverOrientationVU( iID, v3View, v3Up );
pMsg->WriteVec3( v3View );
pMsg->WriteVec3( v3Up );
}
void CVANetNetworkProtocol::ClientSetSoundReceiverOrientationVU( const int iID, const VAVec3& v3View, const VAVec3& v3Up )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_SOUND_RECEIVER_ORIENTATION_VU, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteInt( iID );
pMsg->WriteVec3( v3View );
pMsg->WriteVec3( v3Up );
ClientSendCommand( pMsg );
}
void CVANetNetworkProtocol::ServerSetSoundReceiverOrientationVU()
{
CVANetMessage* pMsg = ServerGetMessage();
const int iID = pMsg->ReadInt();
const VAVec3 v3View = pMsg->ReadVec3();
const VAVec3 v3Up = pMsg->ReadVec3();
m_pRealCore->SetSoundReceiverOrientationVU( iID, v3View, v3Up );
}
std::string CVANetNetworkProtocol::ClientCreateScene( const CVAStruct& oParams, const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SCENE_CREATE, MESSAGE_WITH_ANSWER );
......
......@@ -76,12 +76,17 @@ public:
// Module interface
static const int VA_NP_GET_MODULES = 221;
static const int VA_NP_CALL_MODULE = 222;
static const int VA_NP_GET_SEARCH_PATHS = 230;
// Directivities
static const int VA_NP_CREATE_DIRECTIVITY = 300;
static const int VA_NP_DELETE_DIRECTIVITY = 301;
static const int VA_NP_GET_DIRECTIVITY_INFO = 302;
static const int VA_NP_GET_DIRECTIVITY_INFOS = 303;
static const int VA_NP_GET_DIRECTIVITY_PARAMETERS = 304;
static const int VA_NP_SET_DIRECTIVITY_PARAMETERS = 305;
static const int VA_NP_GET_DIRECTIVITY_NAME = 306;
static const int VA_NP_SET_DIRECTIVITY_NAME = 307;
// Head-related impulse responses (HRIRs)
static const int VA_NP_LOAD_HRIR_DATASET = 400;
......@@ -160,6 +165,7 @@ public:
static const int VA_NP_GET_SOUNDSOURCE_PARAMETERS = 830;
static const int VA_NP_SET_SOUNDSOURCE_ENABLED = 832;
static const int VA_NP_GET_SOUNDSOURCE_ENABLED = 833;
static const int VA_NP_GET_SOUND_SOURCE_INFO = 834;
// Listeners
static const int VA_NP_GET_SOUND_RECEIVER_IDS = 900;
......@@ -364,10 +370,10 @@ public:
std::string ClientGetDirectivityName( const int iID );
void ServerGetDirectivityName();
virtual void ClientSetDirectivityParameters( const int iID, const CVAStruct& oParams );
virtual void ServerSetDirectivityParameters();
virtual CVAStruct ClientGetDirectivityParameters( const int iID, const CVAStruct& oParams );
virtual void ServerGetDirectivityParameters();
virtual void ClientSetDirectivityParameters( const int iID, const CVAStruct& oParams );
virtual void ServerSetDirectivityParameters();
virtual std::string ClientCreateSignalSourceBufferFromParameters( const CVAStruct& oParams, const std::string& sName = "" );
......@@ -543,9 +549,9 @@ public:
virtual void ClientSetSoundReceiverDirectivity( const int iSoundReceiverID, const int iDirectivityID );
virtual void ServerSetSoundReceiverDirectivity();
virtual void ClientGetSoundReceiverPose( const int iID, VAVec3& vPos, VAQuat& qOrient );
virtual void ClientGetSoundReceiverPose( const int iID, VAVec3& v3Pos, VAQuat& qOrient );
virtual void ServerGetSoundReceiverPose();
virtual void ClientSetSoundReceiverPose( const int iID, const VAVec3& vPos, const VAQuat& qOrient );
virtual void ClientSetSoundReceiverPose( const int iID, const VAVec3& v3Pos, const VAQuat& qOrient );
virtual void ServerSetSoundReceiverPose();
virtual VAVec3 ClientGetSoundReceiverPosition( const int iID );
......
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