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

Style, cleanup, renaming

parent fe83401a
......@@ -17,38 +17,37 @@
#include <VANetDefinitions.h>
#include <string>
// Vorwrtsdeklarationen
class CVAAudiostreamProperties;
class CVAAudiostreamState;
//! Receiver-side implementation of a network audio stream
/**
* Sender-side implementation of a network audio stream,
* which transfers samples over TCP network to a audiostream receiver
* Sender and receiver are in an 1:1 relation.
*/
class VANET_API CVANetAudiostreamSender
* Sender-side implementation of a network audio stream,
* which transfers samples over TCP network to a audiostream receiver
* Sender and receiver are in an 1:1 relation.
*/
class VANET_API CVANetAudioStreamReceiver
{
public:
//! Rckgabewerte / Fehlerzustnde
enum {
//! Return types / errors
enum ErrorType
{
VA_NO_ERROR = 0, //!< No error
VA_CONNECTION_LOST, //!< Connection to sender unexpectedly lost
VA_BUFFER_UNDERRUN //!< Not enough samples in the receive buffer
};
CVANetAudiostreamSender(const std::string sSenderAddress, int iSenderPort,
const std::string& sTargetName,
const CVAAudiostreamProperties& oStreamProps,
int iFlags);
virtual ~CVANetAudiostreamSender();
//! Creates an audio stream
CVANetAudioStreamReceiver( const std::string sSenderAddress, int iSenderPort, const std::string& sTargetName, const CVAAudiostreamProperties& oStreamProps, int iFlags );
virtual ~CVANetAudioStreamReceiver();
// Gibt die Adresse des verbundenen Servers zurck
// (Rckgabe: leerer String, falls nicht verbunden)
//! Returns sender address / IP
/**
* @return Empty, if not connected
*/
virtual std::string GetSenderAddress() const=0;
// Receives a block of samples from the sender buffer
// Return: Status information (still connected, etc.)
//! Receives a block of samples from the sender buffer
int ReceiveSamples(const float* pfSamples, int iNumSamples);
};
......
......@@ -3,7 +3,7 @@
*
* VVV VVV A
* VVV VVV AAA Virtual Acoustics (VA)
* VVV VVV AAA Real-time auralisation for virtual reality
* VVV VVV AAA Real-time auralisation for virtual reality
* VVV VVV AAA
* VVVVVV AAA (c) Copyright Institute of Technical Acoustics (ITA), 2015-2017
* VVVV AAA RWTH Aachen University (http://www.akustik.rwth-aachen.de)
......@@ -11,73 +11,74 @@
* --------------------------------------------------------------------------------------------
*/
#ifndef __VANET_AUDIOSTREAM_SENDER_H__
#define __VANET_AUDIOSTREAM_SENDER_H__
#ifndef IW_VANET_AUDIO_STREAM_SERVER
#define IW_VANET_AUDIO_STREAM_SERVER
#include <VANetDefinitions.h>
#include <string>
// Vorwrtsdeklarationen
class CVAAudiostreamProperties;
class CVAAudiostreamState;
//! Server-side implementation of a network audio stream
/**
* Sender-side implementation of a network audio stream,
* which transfers samples over TCP network to a audiostream receiver
* Sender and receiver are in an 1:1 relation.
*/
class VANET_API CVANetAudiostreamReceiver {
* Sender-side implementation of a network audio stream,
* which transfers samples over TCP network to a audio stream receiver
* Sender and receiver are in an 1:1 relation.
*/
class VANET_API CVANetAudioStreamServer
{
public:
//! Rckgabewerte / Fehlerzustnde
enum {
VA_NO_ERROR = 0, //!< Kein Fehler / Erfolgreich
VA_SERVER_CONNECTION_FAILED, //!< Verbindung zum Server fehlgeschlagen - Falsche Addresse, oder Server luft nicht
VA_SERVER_NOT_RESPONDING, //!< Verbindung zum Server wurde aufgebaut, aber keine Antwort erhalten
VA_SERVICE_IN_USE, //!< Netzwerkdienst wird bereits von anderem Client benutzt
VA_CONNECTION_ERROR, //!< Ein unbekannter netzwerkfehler ist aufgetreten
VA_PROTOCOL_INCOMPATIBLE, //!< Das Netzwerkprotokoll von Client und Server ist inkompatibel
VA_UNKNOWN_ERROR,
//! Return types / errors
enum ErrorType
{
VA_NASS_NO_ERROR = 0, //!< No error / success
VA_NASS_SERVER_CONNECTION_FAILED, //!< Verbindung zum Server fehlgeschlagen - Falsche Addresse, oder Server luft nicht
VA_NASS_SERVER_NOT_RESPONDING, //!< Verbindung zum Server wurde aufgebaut, aber keine Antwort erhalten
VA_NASS_SERVICE_IN_USE, //!< Netzwerkdienst wird bereits von anderem Client benutzt
VA_NASS_CONNECTION_ERROR, //!< Ein unbekannter netzwerkfehler ist aufgetreten
VA_NASS_PROTOCOL_INCOMPATIBLE, //!< Das Netzwerkprotokoll von Client und Server ist inkompatibel
VA_NASS_UNKNOWN_ERROR,
};
CVANetAudiostreamReceiver();
virtual ~CVANetAudiostreamReceiver();
CVANetAudioStreamServer();
virtual ~CVANetAudioStreamServer();
// Gibt die Adresse des verbundenen Servers zurck
// (Rckgabe: leerer String, falls nicht verbunden)
virtual std::string GetServerAddress() const=0;
virtual std::string GetServerAddress() const = 0;
// Client initialisieren und mit einem Server verbinden
// (Rckgabe: Statuscode)
virtual int Initialize(const std::string& sBindAddress, int iPort)=0;
virtual int Initialize( const std::string& sBindAddress, int iPort ) = 0;
void Finalize();
class VANET_API Handler {
class VANET_API IHandler
{
public:
virtual ~Handler() {};
inline virtual ~IHandler() {};
// Handle that the connection to a receiver is established
// Thereby the sender it told the expected stream properties (sampling rate, buffersize)
// and designated signal source name on the receiver-side (VA).
// Returns: Status code (0=Connection accepted, 1=Connection refused)
virtual int HandleReceiverConnect(const CVAAudiostreamProperties& oStreamProps,
const std::string& sSignalSourceName)=0;
virtual int HandleReceiverConnect( const CVAAudiostreamProperties& oStreamProps, const std::string& sSignalSourceName ) = 0;
// Informs that the connection to the receiver is closed
virtual void HandleReceiverDisconnect()=0;
virtual void HandleReceiverDisconnect() = 0;
// Receiver-side requests new samples from the sender
// Thereby the sender is informed about the current status of the audiostream
virtual void HandleReceiverRequestSamples(const CVAAudiostreamState& oStreamState)=0;
virtual void HandleReceiverRequestSamples( const CVAAudiostreamState& oStreamState ) = 0;
};
// Sets the handler for sender events
void SetEventHandler(Handler* pHandler);
void SetEventHandler( IHandler* pHandler );
// Pushes a block of samples into the sender buffer and transfers them to the client
// Return: Status information (still connected, etc.)
int SendSamples(const float* pfSamples, int iNumSamples);
int SendSamples( const float* pfSamples, int iNumSamples );
};
#endif // __VANET_AUDIOSTREAM_SENDER_H__
#endif // IW_VANET_AUDIO_STREAM_SERVER
......@@ -17,7 +17,6 @@
#include <VANetDefinitions.h>
#include <string>
// Vorwrtsdeklarationen
class IVACore;
class CVANetNetworkProtocol;
......@@ -41,7 +40,7 @@ class VANET_API IVANetClient
{
public:
//! Rckgabewerte / Fehlerzustnde
enum
enum ErrorType
{
VA_NO_ERROR = 0, //!< Kein Fehler / Erfolgreich
VA_SERVER_CONNECTION_FAILED, //!< Verbindung zum Server fehlgeschlagen - Falsche Addresse, oder Server luft nicht
......@@ -53,7 +52,7 @@ public:
};
//HeadChannel Modi
enum
enum HeadChannelMode
{
VA_HC_USE_EXISTING = 0,
VA_HC_SEPARATE_TCP,
......@@ -61,7 +60,7 @@ public:
};
// Exception Handling Modi
enum
enum ExceptionHandlingMode
{
EXC_CLIENT_THROW, // for all functions, immediately transmit exception and throws it
//EXC_ASYNC_PRINT, // functions without return value immediately return,
......@@ -87,10 +86,7 @@ public:
// Client initialisieren und mit einem Server verbinden
// (Rckgabe: Statuscode)
virtual int Initialize( const std::string& sServerAddress, int iServerPort = VANET_DEFAULT_PORT,
int iHeadChannelMode = VA_HC_USE_EXISTING,
int IExceptionHandlingMode = EXC_CLIENT_THROW,
bool bBufferSynchronizedCommands = true ) = 0;
virtual int Initialize( const std::string& sServerAddress, int iServerPort = VANET_DEFAULT_PORT, int iHeadChannelMode = VA_HC_USE_EXISTING, int IExceptionHandlingMode = EXC_CLIENT_THROW, bool bBufferSynchronizedCommands = true ) = 0;
virtual void SetExceptionHandlingMode( int nMode ) = 0;
virtual int GetExceptionhandlingMode() const = 0;
......@@ -98,12 +94,11 @@ public:
// Vorhandene Serververbindung beenden
// (Rckgabe: Statuscode)
virtual int Disconnect() = 0;
class CEvent
{
public:
enum
enum EventTypes
{
EVENT_NOTHING = 0,
EVENT_SERVER_DISCONNECT, // Gewollter Verbindungsabbruch
......@@ -113,8 +108,8 @@ public:
int iType; // Typ der Ereignisses
std::string sServer; //
inline CEvent()
: iType( EVENT_NOTHING )
inline CEvent()
: iType( EVENT_NOTHING )
{
};
......@@ -125,9 +120,10 @@ public:
};
};
class IEventHandler {
class IEventHandler
{
public:
virtual ~IEventHandler() {};
inline virtual ~IEventHandler() {};
virtual void HandleEvent( const IVANetClient::CEvent& oEvent ) = 0;
};
......
......@@ -76,11 +76,7 @@ public:
* Rckgabe: Statuscode
*/
// @todo: enforce setting real core in initialize call
virtual int Initialize( const std::string& sInterface,
int iServerPort = VANET_DEFAULT_PORT,
int iFreePortMin = 10000,
int iFreePortMax = 11000,
int iMaxNumClients = -1 ) = 0;
virtual int Initialize( const std::string& sInterface, int iServerPort = VANET_DEFAULT_PORT, int iFreePortMin = 10000, int iFreePortMax = 11000, int iMaxNumClients = -1 ) = 0;
/**
* Server initialisieren
......@@ -93,10 +89,7 @@ public:
*
* Rckgabe: Statuscode
*/
virtual int Initialize( const std::string& sInterface,
int iServerPort,
const tPortList& liFreePorts,
int iMaxNumClients = -1 ) = 0;
virtual int Initialize( const std::string& sInterface, int iServerPort, const tPortList& liFreePorts, int iMaxNumClients = -1 ) = 0;
// Vorhandene Serververbindungen trennen und Server beenden
// (Rckgabe: Statuscode)
......@@ -149,13 +142,18 @@ public:
int iType; // Typ der Ereignisses
std::string sClient; //
inline CEvent() : iType( EVENT_NOTHING ) {};
inline CEvent()
: iType( EVENT_NOTHING )
{};
inline CEvent( int iInitType, const std::string& sInitParam )
: iType( iInitType ), sClient( sInitParam ) {};
: iType( iInitType )
, sClient( sInitParam )
{};
};
class IEventHandler {
class IEventHandler
{
public:
inline virtual ~IEventHandler() {};
......@@ -165,7 +163,6 @@ public:
virtual bool AttachEventHandler( IVANetServer::IEventHandler* pHandler ) = 0;
virtual bool DetachEventHandler( IVANetServer::IEventHandler* pHandler ) = 0;
protected:
IVANetServer();
};
......
......@@ -4,8 +4,8 @@ set( RelativeDir "include" )
set( RelativeSourceGroup "include" )
set( DirFiles
VANetAudiostreamReceiver.h
VANetAudiostreamSender.h
VANetAudioStreamReceiver.h
VANetAudioStreamSender.h
VANetClient.h
VANetDefinitions.h
VANetServer.h
......
/*
*
* VVV VVV A
* VVV VVV AAA Virtual Acoustics
* VVV VVV AAA Real-time auralisation for virtual reality
* VVV VVV AAA
* VVVVVV AAA (c) Copyright Institut fr Technische Akustik (ITA)
* VVVV AAA RWTH Aachen (http://www.akustik.rwth-aachen.de)
*
* ---------------------------------------------------------------------------------
*
* Datei: VANetClient.cpp
*
* Zweck: Schnittstelle des Netzwerk-Clients fr den VA-Kernel
*
* Autor(en): Frank Wefers (Frank.Wefers@akustik.rwth-aachen.de),
* Dominik Rausch (rausch@vr.rwth-aachen.de)
*
* ---------------------------------------------------------------------------------
*/
// $Id: VANetClient.cpp 3417 2013-08-07 14:09:17Z stienen $
#include <VANetClient.h>
#include "VANetClientImpl.h"
IVANetClient* IVANetClient::Create() {
IVANetClient* IVANetClient::Create()
{
return new CVANetClientImpl();
}
IVANetClient::IVANetClient() {}
IVANetClient::~IVANetClient() {}
IVANetClient::IVANetClient()
{
}
IVANetClient::~IVANetClient()
{
}
/*
*
* VVV VVV A
* VVV VVV AAA Virtual Acoustics
* VVV VVV AAA Real-time auralisation for virtual reality
* VVV VVV AAA
* VVVVVV AAA (c) Copyright Institut fr Technische Akustik (ITA)
* VVVV AAA RWTH Aachen (http://www.akustik.rwth-aachen.de)
*
* ---------------------------------------------------------------------------------
*
* Datei: VANetClientImpl.h
*
* Zweck: Implementierung des Netzwerk-Clients fr den VA-Kernel
*
* Autor(en): Frank Wefers (Frank.Wefers@akustik.rwth-aachen.de),
* Dominik Rausch (rausch@vr.rwth-aachen.de)
*
* ---------------------------------------------------------------------------------
*/
// $Id: VANetClientImpl.h 4589 2016-02-24 22:27:08Z stienen $
#ifndef __VANET_CLIENTIMPL_H__
#define __VANET_CLIENTIMPL_H__
......@@ -37,7 +14,8 @@ class VistaMutex;
* Thread-Safe implementation
*/
class CVANetClientImpl : public IVANetClient {
class CVANetClientImpl : public IVANetClient
{
public:
CVANetClientImpl();
~CVANetClientImpl();
......@@ -46,10 +24,7 @@ public:
bool IsConnected() const;
std::string GetServerAddress() const;
int Initialize(const std::string& sServerAddress, int iServerPort,
int iHeadChannelMode = VA_HC_USE_EXISTING,
int IExceptionHandlingMode = EXC_CLIENT_THROW,
bool bBufferSynchronizedCommands = true );
int Initialize( const std::string& sServerAddress, int iServerPort, int iHeadChannelMode = VA_HC_USE_EXISTING, int IExceptionHandlingMode = EXC_CLIENT_THROW, bool bBufferSynchronizedCommands = true );
int Disconnect();
void SendConnectionEvent( int nId );
......
......@@ -84,12 +84,12 @@ void CVANetNetworkProtocol::SetExceptionHandlingMode( int nMode )
{
m_iExceptionHandlingMode = nMode;
}
int CVANetNetworkProtocol::GetExceptionHandlingMode() const
{
return m_iExceptionHandlingMode;
}
void CVANetNetworkProtocol::SetRealVACore( IVACore* pCore )
{
m_pRealCore = pCore;
......@@ -580,8 +580,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();
......@@ -599,8 +598,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();
......@@ -615,8 +613,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 );
}
......@@ -627,8 +624,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 );
}
......@@ -639,8 +635,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 );
}
......@@ -659,8 +654,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 );
}
......@@ -671,8 +665,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 );
}
......@@ -688,9 +681,9 @@ void CVANetNetworkProtocol::ServerDetachCoreEventHandler( VistaConnectionIP* pCo
* | | *
* +----------------------------------------------------------+ */
void CVANetNetworkProtocol::ClientEnumerateModules( std::vector<CVAModuleInfo>& m_viModuleInfos ) {
CVANetMessage* pMsg = ClientInitMessage( VA_NP_ENUMERATE_MODULES,
MESSAGE_WITH_ANSWER );
void CVANetNetworkProtocol::ClientEnumerateModules( std::vector<CVAModuleInfo>& m_viModuleInfos )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_ENUMERATE_MODULES, MESSAGE_WITH_ANSWER );
ClientSendCommand( pMsg );
int nModules = pMsg->ReadInt();
......@@ -702,7 +695,8 @@ void CVANetNetworkProtocol::ClientEnumerateModules( std::vector<CVAModuleInfo>&
pMsg->ReadModuleInfo( m_viModuleInfos[ i ] );
}
void CVANetNetworkProtocol::ServerEnumerateModules() {
void CVANetNetworkProtocol::ServerEnumerateModules()
{
CVANetMessage* pMsg = ServerGetMessage();
std::vector<CVAModuleInfo> viModules;
......@@ -745,8 +739,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 );
......@@ -769,8 +762,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 );
......@@ -790,8 +782,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 );
......@@ -813,8 +804,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 );
......@@ -843,10 +833,9 @@ void CVANetNetworkProtocol::ServerGetDirectivityInfos()
* | | *
* +----------------------------------------------------------+ */
int CVANetNetworkProtocol::ClientLoadHRIRDataset( const std::string& sFilename,
const std::string& sName ) {
CVANetMessage* pMsg = ClientInitMessage( VA_NP_LOAD_HRIR_DATASET,
MESSAGE_WITH_ANSWER );
int CVANetNetworkProtocol::ClientLoadHRIRDataset( const std::string& sFilename, const std::string& sName )
{
CVANetMessage* pMsg = ClientInitMessage( VA_NP_LOAD_HRIR_DATASET, MESSAGE_WITH_ANSWER );
pMsg->WriteString( sFilename );
pMsg->WriteString( sName );
......@@ -856,7 +845,8 @@ int CVANetNetworkProtocol::ClientLoadHRIRDataset( const std::string& sFilename,
return pMsg->ReadInt();
}
void CVANetNetworkProtocol::ServerLoadHRIRDataset() {
void CVANetNetworkProtocol::ServerLoadHRIRDataset()
{
CVANetMessage* pMsg = ServerGetMessage();
std::string sFilename = pMsg->ReadString();
......@@ -869,8 +859,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 );
......@@ -892,8 +881,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 );
......@@ -915,8 +903,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 );
......@@ -947,8 +934,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 );
......@@ -971,8 +957,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 );
......@@ -993,8 +978,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 );
......@@ -1016,8 +1000,7 @@ void CVANetNetworkProtocol::ServerGetSoundInfo()
void CVANetNetworkProtocol::ClientGetSoundInfos( std::vector<CVASoundInfo>& vsiDest )
{