Skip to content

GitLab

Commit b00cbff2 authored by Jonas Stienen's avatar Jonas Stienen
Browse files

Merge branch 'develop' of https://git.rwth-aachen.de/ita/VANet into develop

parents 0cec2ab6 2be83192
Expand all Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ b00cbff2
......@@ -10,7 +10,7 @@ if( NOT DEFINED ITA_VANET_VERSION_MAJOR )
endif( )
if( NOT DEFINED ITA_VANET_VERSION_MINOR )
set( ITA_VANET_VERSION_MINOR "a" CACHE STRING "VANet version minor (usually a,b,c ...)" )
set( ITA_VANET_VERSION_MINOR "b" CACHE STRING "VANet version minor (usually a,b,c ...)" )
endif( )
if( NOT DEFINED ITA_VANET_DEFAULT_PORT )
......
src/VANetClientImpl.cpp
View file @ b00cbff2
......@@ -277,14 +277,23 @@ public:
* | | *
* +----------------------------------------------------------+ */
virtual std::string CreateAudiofileSignalSource( const std::string& sFilename,
virtual inline std::string CreateAudiofileSignalSource( const std::string& sFilename,
const std::string& sName = "" ) {
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientCreateAudiofileSignalSource( sFilename, sName );
}
};
virtual inline std::string CreateTextToSpeechSignalSource( const std::string& sName = "" )
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientCreateTextToSpeechSignalSource( sName );
};
virtual std::string CreateSequencerSignalSource( const std::string& sName = "" ) {
virtual inline std::string CreateSequencerSignalSource( const std::string& sName = "" )
{
VA_REQUIRE_CONNECTED;
VA_MUTAL_EXCLUDE;
return m_pProtocol->ClientCreateSequencerSignalSource( sName );
......@@ -1213,8 +1222,8 @@ public:
oChannelLock.Unlock();
IndicateLoopEnd();
m_pParent->ProcessEventChannelError();
}
}
}
#ifdef VANET_CLIENT_VERBOSE
catch( VistaExceptionBase& oException )
{
......@@ -1238,7 +1247,7 @@ public:
m_pParent->ProcessEventChannelError();
}
return false;
};
};
inline virtual void PreLoop()
{
......@@ -1261,7 +1270,7 @@ private:
std::list<IVACoreEventHandler*> m_liCoreEventHandlers;
VistaMutex m_oHandlerListLock;
VistaMutex* m_pEventChannelLock;
};
};
......@@ -1375,7 +1384,7 @@ int CVANetClientImpl::Initialize( const std::string& sServerAddress, int iServer
// server responded, but it doesn't accept any more connections
Cleanup();
return VA_SERVICE_IN_USE;
}
}
m_pCommandChannel = new VistaConnectionIP( VistaConnectionIP::CT_TCP, m_sServerIP, iCommandChannelPort );
#ifdef VANET_CLIENT_SHOW_RAW_TRAFFIC
m_pCommandChannel->SetShowRawSendAndReceive( true );
......@@ -1468,9 +1477,7 @@ int CVANetClientImpl::Initialize( const std::string& sServerAddress, int iServer
m_pEventChannel->SetByteorderSwapFlag( m_pCommandChannel->GetByteorderSwapFlag() );
m_pEventChannel->SetIsBlocking( true );
m_pVACore = new CNetworkedVACore( m_pProtocol, this,
m_pCommandChannel,
m_pHeadChannel );
m_pVACore = new CNetworkedVACore( m_pProtocol, this, m_pCommandChannel, m_pHeadChannel );
m_pEventReceiver = new CEventReceiver( this, m_pProtocol, m_pEventChannel, m_pEventChannelLock );
m_pEventReceiver->Run();
......
src/VANetNetworkProtocol.cpp
View file @ b00cbff2
......@@ -140,6 +140,7 @@ void CVANetNetworkProtocol::ServerCallFunctionByMessageType( int nMessageType,
// Signal sources
SERVER_FUNCTION_MAPPING( VA_NP_CREATE_AUDIOFILE_SIGNAL_SOURCE, ServerCreateAudiofileSignalSource() );
SERVER_FUNCTION_MAPPING( VA_NP_CREATE_TTS_SIGNAL_SOURCE, ServerCreateTextToSpeechSignalSource() );
SERVER_FUNCTION_MAPPING( VA_NP_CREATE_SEQUENCER_SIGNALSOURCE, ServerCreateSequencerSignalSource() );
SERVER_FUNCTION_MAPPING( VA_NP_CREATE_NETWORK_STREAM_SIGNALSOURCE, ServerCreateNetworkStreamSignalSource() );
SERVER_FUNCTION_MAPPING( VA_NP_CREATE_ENGINE_SIGNALSOURCE, ServerCreateEngineSignalSource() );
......@@ -580,7 +581,7 @@ void CVANetNetworkProtocol::ClientSendCommand( CVANetMessage* pMessage )
void CVANetNetworkProtocol::ClientGetVersionInfo( CVACoreVersionInfo* pVersionInfo )
{
if( !pVersionInfo ) return;
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_VERSION_INFO, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_VERSION_INFO, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
*pVersionInfo = pMsg->ReadCoreVersionInfo();
......@@ -598,7 +599,7 @@ void CVANetNetworkProtocol::ServerGetVersionInfo()
int CVANetNetworkProtocol::ClientGetState()
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_STATE, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_STATE, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
return pMsg->ReadInt();
......@@ -613,7 +614,7 @@ void CVANetNetworkProtocol::ServerGetState()
void CVANetNetworkProtocol::ClientInitialize()
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_INITIALIZE, MESSAGE_ENFORCED_EXCEPTION );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_INITIALIZE, MESSAGE_ENFORCED_EXCEPTION );
ClientSendCommand( pMsg );
}
......@@ -624,7 +625,7 @@ void CVANetNetworkProtocol::ServerInitialize()
void CVANetNetworkProtocol::ClientFinalize()
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_FINALIZE, MESSAGE_ENFORCED_EXCEPTION );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_FINALIZE, MESSAGE_ENFORCED_EXCEPTION );
ClientSendCommand( pMsg );
}
......@@ -635,7 +636,7 @@ void CVANetNetworkProtocol::ServerFinalize()
void CVANetNetworkProtocol::ClientReset()
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_RESET, MESSAGE_ENFORCED_EXCEPTION );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_RESET, MESSAGE_ENFORCED_EXCEPTION );
ClientSendCommand( pMsg );
}
......@@ -654,7 +655,7 @@ void CVANetNetworkProtocol::ServerReset()
void CVANetNetworkProtocol::ClientAttachCoreEventHandler()
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_ATTACH_COREEVENT_HANDLER, MESSAGE_ENFORCED_EXCEPTION );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_ATTACH_COREEVENT_HANDLER, MESSAGE_ENFORCED_EXCEPTION );
ClientSendCommand( pMsg );
}
......@@ -665,7 +666,7 @@ void CVANetNetworkProtocol::ServerAttachCoreEventHandler( VistaConnectionIP* pCo
void CVANetNetworkProtocol::ClientDetachCoreEventHandler()
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_DETACH_COREEVENT_HANDLER, MESSAGE_ENFORCED_EXCEPTION );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_DETACH_COREEVENT_HANDLER, MESSAGE_ENFORCED_EXCEPTION );
ClientSendCommand( pMsg );
}
......@@ -683,7 +684,7 @@ void CVANetNetworkProtocol::ServerDetachCoreEventHandler( VistaConnectionIP* pCo
void CVANetNetworkProtocol::ClientEnumerateModules( std::vector<CVAModuleInfo>& m_viModuleInfos )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_ENUMERATE_MODULES, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_ENUMERATE_MODULES, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
int nModules = pMsg->ReadInt();
......@@ -739,7 +740,7 @@ void CVANetNetworkProtocol::ServerCallModule()
int CVANetNetworkProtocol::ClientLoadDirectivity( const std::string& sFilename, const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_LOAD_DIRECTIVITY, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_LOAD_DIRECTIVITY, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sFilename );
pMsg->WriteString( sName );
......@@ -762,7 +763,7 @@ void CVANetNetworkProtocol::ServerLoadDirectivity()
bool CVANetNetworkProtocol::ClientFreeDirectivity( int iDirID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_FREE_DIRECTIVITY, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_FREE_DIRECTIVITY, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iDirID );
ClientSendCommand( pMsg );
......@@ -782,7 +783,7 @@ void CVANetNetworkProtocol::ServerFreeDirectivity()
CVADirectivityInfo CVANetNetworkProtocol::ClientGetDirectivityInfo( int iDirID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_DIRECTIVITY_INFO, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_DIRECTIVITY_INFO, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iDirID );
ClientSendCommand( pMsg );
......@@ -804,7 +805,7 @@ void CVANetNetworkProtocol::ServerGetDirectivityInfo()
void CVANetNetworkProtocol::ClientGetDirectivityInfos( std::vector<CVADirectivityInfo>& vdiDest )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_DIRECTIVITY_INFOS, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_DIRECTIVITY_INFOS, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
......@@ -833,9 +834,9 @@ void CVANetNetworkProtocol::ServerGetDirectivityInfos()
* | | *
* +----------------------------------------------------------+ */
int CVANetNetworkProtocol::ClientLoadHRIRDataset( const std::string& sFilename, const std::string& sName )
int CVANetNetworkProtocol::ClientLoadHRIRDataset( const std::string& sFilename, const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_LOAD_HRIR_DATASET, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_LOAD_HRIR_DATASET, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sFilename );
pMsg->WriteString( sName );
......@@ -859,7 +860,7 @@ void CVANetNetworkProtocol::ServerLoadHRIRDataset()
bool CVANetNetworkProtocol::ClientFreeHRIRDataset( int iHRIRID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_FREE_HRIR_DATASET, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_FREE_HRIR_DATASET, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iHRIRID );
......@@ -881,7 +882,7 @@ void CVANetNetworkProtocol::ServerFreeHRIRDataset()
CVAHRIRInfo CVANetNetworkProtocol::ClientGetHRIRInfo( int iHRIRID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_HRIR_INFO, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_HRIR_INFO, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iHRIRID );
ClientSendCommand( pMsg );
......@@ -903,7 +904,7 @@ void CVANetNetworkProtocol::ServerGetHRIRInfo()
void CVANetNetworkProtocol::ClientGetHRIRInfos( std::vector<CVAHRIRInfo>& vhiDest )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_HRIR_INFOS, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_HRIR_INFOS, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
......@@ -934,7 +935,7 @@ void CVANetNetworkProtocol::ServerGetHRIRInfos()
int CVANetNetworkProtocol::ClientLoadSound( const std::string& sFilename, const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_LOAD_SOUND, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_LOAD_SOUND, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sFilename );
pMsg->WriteString( sName );
......@@ -957,7 +958,7 @@ void CVANetNetworkProtocol::ServerLoadSound()
bool CVANetNetworkProtocol::ClientFreeSound( int iSoundID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_FREE_SOUND, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_FREE_SOUND, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iSoundID );
ClientSendCommand( pMsg );
......@@ -978,7 +979,7 @@ void CVANetNetworkProtocol::ServerFreeSound()
CVASoundInfo CVANetNetworkProtocol::ClientGetSoundInfo( int iSoundID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_INFO, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_INFO, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iSoundID );
ClientSendCommand( pMsg );
......@@ -1000,7 +1001,7 @@ void CVANetNetworkProtocol::ServerGetSoundInfo()
void CVANetNetworkProtocol::ClientGetSoundInfos( std::vector<CVASoundInfo>& vsiDest )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_INFOS, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_INFOS, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
......@@ -1058,7 +1059,7 @@ void CVANetNetworkProtocol::ServerPlaySound()
std::string CVANetNetworkProtocol::ClientCreateAudiofileSignalSource( const std::string& sFilename,
const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_AUDIOFILE_SIGNAL_SOURCE, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_AUDIOFILE_SIGNAL_SOURCE, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sFilename );
pMsg->WriteString( sName );
......@@ -1080,9 +1081,25 @@ void CVANetNetworkProtocol::ServerCreateAudiofileSignalSource()
pMsg->WriteString( sID );
}
std::string CVANetNetworkProtocol::ClientCreateTextToSpeechSignalSource( const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_TTS_SIGNAL_SOURCE, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sName );
ClientSendCommand( pMsg );
return pMsg->ReadString();
}
void CVANetNetworkProtocol::ServerCreateTextToSpeechSignalSource()
{
CVANetMessage* pMsg = ServerGetMessage();
std::string sName = pMsg->ReadString();
std::string sID = m_pRealCore->CreateTextToSpeechSignalSource( sName );
pMsg->WriteString( sID );
}
std::string CVANetNetworkProtocol::ClientCreateSequencerSignalSource( const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_SEQUENCER_SIGNALSOURCE, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_SEQUENCER_SIGNALSOURCE, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sName );
......@@ -1106,7 +1123,7 @@ std::string CVANetNetworkProtocol::ClientCreateNetworkStreamSignalSource( const
int iPort,
const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_NETWORK_STREAM_SIGNALSOURCE, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_NETWORK_STREAM_SIGNALSOURCE, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sInterface );
pMsg->WriteInt( iPort );
......@@ -1176,7 +1193,7 @@ void CVANetNetworkProtocol::ServerCreateMachineSignalSource()
bool CVANetNetworkProtocol::ClientDeleteSignalSource( const std::string& sID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_DELETE_SIGNALSOURCE, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_DELETE_SIGNALSOURCE, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sID );
......@@ -1198,7 +1215,7 @@ void CVANetNetworkProtocol::ServerDeleteSignalSource()
std::string CVANetNetworkProtocol::ClientGetSoundSourceSignalSource( int iSoundSourceID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUNDSOURCE_SIGNALSOURCE, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUNDSOURCE_SIGNALSOURCE, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iSoundSourceID );
......@@ -1220,7 +1237,7 @@ void CVANetNetworkProtocol::ServerGetSoundSourceSignalSource()
CVASignalSourceInfo CVANetNetworkProtocol::ClientGetSignalSourceInfo( const std::string& sSignalSourceID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SIGNALSOURCE_INFO, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SIGNALSOURCE_INFO, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sSignalSourceID );
ClientSendCommand( pMsg );
......@@ -1242,7 +1259,7 @@ void CVANetNetworkProtocol::ServerGetSignalSourceInfo()
void CVANetNetworkProtocol::ClientGetSignalSourceInfos( std::vector<CVASignalSourceInfo>& vssiDest )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SIGNALSOURCE_INFOS, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SIGNALSOURCE_INFOS, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
......@@ -1266,7 +1283,7 @@ void CVANetNetworkProtocol::ServerGetSignalSourceInfos()
int CVANetNetworkProtocol::ClientGetAudiofileSignalSourcePlaybackState( const std::string& sSignalSourceID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_AUDIOFILE_SIGNALSOURCE_PLAYSTATE, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_AUDIOFILE_SIGNALSOURCE_PLAYSTATE, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sSignalSourceID );
......@@ -1337,7 +1354,7 @@ void CVANetNetworkProtocol::ServerGetAudiofileSignalSourceIsLooping()
void CVANetNetworkProtocol::ClientSetAudiofileSignalSourcePlaybackPosition( const std::string& sSignalSourceID,
double dPlaybackPosition )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_AUDIOFILE_SIGNALSOURCE_PLAYPOS, MESSAGE_ALLOWS_BUFFERING );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_AUDIOFILE_SIGNALSOURCE_PLAYPOS, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteString( sSignalSourceID );
pMsg->WriteDouble( dPlaybackPosition );
......@@ -1357,7 +1374,7 @@ void CVANetNetworkProtocol::ServerSetAudiofileSignalSourcePlaybackPosition()
int CVANetNetworkProtocol::ClientAddSoundPlayback( const std::string& sSignalSourceID, int iSoundID, int iFlags, double dTimecode )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SEQUENCER_ADD_SOUND_PLAYBACK, MESSAGE_ALLOWS_BUFFERING );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SEQUENCER_ADD_SOUND_PLAYBACK, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteString( sSignalSourceID );
pMsg->WriteInt( iSoundID );
......@@ -1385,7 +1402,7 @@ void CVANetNetworkProtocol::ServerAddSoundPlayback()
bool CVANetNetworkProtocol::ClientRemoveSoundPlayback( int iPlaybackID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SEQUENCER_REMOVE_SOUND_PLAYBACK, MESSAGE_ALLOWS_BUFFERING );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SEQUENCER_REMOVE_SOUND_PLAYBACK, MESSAGE_ALLOWS_BUFFERING );
pMsg->WriteInt( iPlaybackID );
......@@ -1510,7 +1527,7 @@ bool CVANetNetworkProtocol::ClientIsSceneLocked()
{
if( m_bBufferingActive ) return true;
CVANetMessage* pMsg = ClientInitMessage( VA_NP_IS_SCENE_LOCKED, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_IS_SCENE_LOCKED, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
......@@ -1535,7 +1552,7 @@ void CVANetNetworkProtocol::ServerIsSceneLocked()
void CVANetNetworkProtocol::ClientGetSoundSourceIDs( std::vector<int>& vSoundSourceIDs )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_SOURCE_IDS, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUND_SOURCE_IDS, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
......@@ -1559,7 +1576,7 @@ void CVANetNetworkProtocol::ServerGetSoundSourceIDs()
int CVANetNetworkProtocol::ClientCreateSoundSource( const std::string& sName, int iAuralizationMode, double dVolume )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_SOUNDSOURCE, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_CREATE_SOUNDSOURCE, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sName );
pMsg->WriteInt( iAuralizationMode );
......@@ -1609,7 +1626,7 @@ void CVANetNetworkProtocol::ServerCreateSoundSourceExplicitRenderer()
int CVANetNetworkProtocol::ClientDeleteSoundSource( int iSoundSourceID )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_DELETE_SOUNDSOURCE, MESSAGE_WITH_ANSWER );
CVANetMessage* pMsg = ClientInitMessage( VA_NP_DELETE_SOUNDSOURCE, MESSAGE_WITH_ANSWER );
pMsg->WriteInt( iSoundSourceID );
......@@ -1991,7 +2008,7 @@ void CVANetNetworkProtocol::ServerGetSoundSourcePosition()
pMsg->WriteDouble( z );
}
void CVANetNetworkProtocol::ClientSetSoundSourceOrientationVU( int iSoundSourceID, double vx, double vy, double vz, double ux, double uy, double uz )
void CVANetNetworkProtocol::ClientSetSoundSourceOrientationVU( int iSoundSourceID, double vx, double vy, double vz, double ux, double uy, double uz )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_SET_SOUNDSOURCE_ORIENTATION_VU,
MESSAGE_ALLOWS_BUFFERING );
......@@ -2026,7 +2043,7 @@ void CVANetNetworkProtocol::ServerSetSoundSourceOrientationVU()
m_pRealCore->SetSoundSourceOrientationVU( iSoundSourceID, vx, vy, vz, ux, uy, uz );
}
void CVANetNetworkProtocol::ClientGetSoundSourceOrientationVU( int iSoundSourceID, double& vx, double& vy, double& vz, double& ux, double& uy, double& uz )
void CVANetNetworkProtocol::ClientGetSoundSourceOrientationVU( int iSoundSourceID, double& vx, double& vy, double& vz, double& ux, double& uy, double& uz )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUNDSOURCE_ORIENTATION_VU,
MESSAGE_WITH_ANSWER );
......@@ -2063,7 +2080,7 @@ void CVANetNetworkProtocol::ServerGetSoundSourceOrientationVU()
pMsg->WriteDouble( uz );
}
void CVANetNetworkProtocol::ClientGetSoundSourcePositionOrientationVelocityYPR( int iSoundSourceID,double& dPosX, double& dPosY, double& dPosZ, double& dYaw, double& dPitch, double& dRoll, double& dVelocityX, double& dVelocityY, double& dVelocityZ )
void CVANetNetworkProtocol::ClientGetSoundSourcePositionOrientationVelocityYPR( int iSoundSourceID, double& dPosX, double& dPosY, double& dPosZ, double& dYaw, double& dPitch, double& dRoll, double& dVelocityX, double& dVelocityY, double& dVelocityZ )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_GET_SOUNDSOURCE_POSITION_ORIENT_VELOCITY_YPR,
MESSAGE_WITH_ANSWER );
......
src/VANetNetworkProtocol.h
View file @ b00cbff2
This diff is collapsed.
Supports Markdown
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