Aufgrund einer Wartung wird GitLab am 17.08. zwischen 8:30 und 9:00 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to maintenance, GitLab will be temporarily unavailable on 17.08. between 8:30 and 9:00 am.

Updating some more interfaces and retrating default options where interface is...

Updating some more interfaces and retrating default options where interface is not used by external user
parent 24913538
......@@ -55,7 +55,7 @@ public:
~CITANetAudioStreamingServer();
//! Start to listen on a socket (blocking)
bool Start( const std::string& sAddress, const int iPort, const double dTimeIntervalCientSendStatus );
bool Start( const std::string& sAddress, const int iPort, const double dTimeIntervalCientSendStatus, const bool bUseUDP = false );
bool IsClientConnected() const;
std::string GetNetworkAddress() const;
int GetNetworkPort() const;
......
......@@ -52,7 +52,7 @@ int CITANetAudioServer::GetNetworkPort() const
return m_iServerPort;
}
bool CITANetAudioServer::Start( const std::string& sAddress, const int iPort, const bool bUseUDP /* = false */ )
bool CITANetAudioServer::Start( const std::string& sAddress, const int iPort, const bool bUseUDP )
{
if( m_pTCPServer || m_pUDPSocket )
ITA_EXCEPT1( MODAL_EXCEPTION, "This NetAudio server is already started" );
......
......@@ -48,7 +48,7 @@ public:
std::string GetServerAddress() const;
int GetNetworkPort() const;
bool Start( const std::string& sAddress, const int iPort, const bool bUseUDP = false );
bool Start( const std::string& sAddress, const int iPort, const bool bUseUDP );
void Stop();
VistaConnectionIP* GetConnection() const;
......
......@@ -256,7 +256,7 @@ void CITANetAudioStreamingClient::SetClientLoggerBaseName( const std::string& sB
m_pMessage->SetMessageLoggerBaseName( GetClientLoggerBaseName() + "_Messages" );
}
void CITANetAudioStreamingClient::SetDebuggingEnabled( bool bEnabled )
void CITANetAudioStreamingClient::SetDebuggingEnabled( const bool bEnabled )
{
m_bDebuggingEnabled = bEnabled;
m_pMessage->SetDebuggingEnabled( bEnabled );
......
......@@ -62,7 +62,7 @@ public:
std::string GetClientLoggerBaseName() const;
void SetClientLoggerBaseName( const std::string& );
void SetDebuggingEnabled( bool bEnabled );
void SetDebuggingEnabled( const bool bEnabled );
bool GetIsDebuggingEnabled() const;
protected:
......
......@@ -89,12 +89,12 @@ CITANetAudioStreamingServer::~CITANetAudioStreamingServer()
}
bool CITANetAudioStreamingServer::Start( const std::string& sAddress, const int iPort, const double dTimeIntervalCientSendStatus )
bool CITANetAudioStreamingServer::Start( const std::string& sAddress, const int iPort, const double dTimeIntervalCientSendStatus, const bool bUseUDP /* = false */ )
{
if( !m_pInputStream )
ITA_EXCEPT1( MODAL_EXCEPTION, "Can not start server without a valid input stream" );
if( !m_pNetAudioServer->Start( sAddress, iPort ) ) // blocking
if( !m_pNetAudioServer->Start( sAddress, iPort, bUseUDP ) ) // blocking
return false;
m_pConnection = m_pNetAudioServer->GetConnection();
......
......@@ -32,6 +32,7 @@ const static double g_dSyncTimout = 0.001f;
const static bool g_bUseASIO = true;
const static string g_sAudioInterface = "ASIO4ALL v2";
//const static string g_sAudioInterface = "ASIO Hammerfall DSP";
const static bool g_bUseUDP = false;
class CServer : public VistaThread
{
......@@ -64,7 +65,7 @@ public:
void ThreadBody( )
{
vstr::out() << "[ NetAudioTestServer ] Starting net audio server and waiting for client connections on '" << g_sServerName << "' on port " << g_iServerPort << endl;
pStreamingServer->Start( g_sServerName, g_iServerPort, g_dSyncTimout );
pStreamingServer->Start( g_sServerName, g_iServerPort, g_dSyncTimout, g_bUseUDP );
};
private:
......@@ -125,7 +126,7 @@ void run_test()
vstr::out() << "[ NetAudioTestClient ] Will now connect to net audio server '" << g_sServerName << "' on port " << g_iServerPort << endl;
if( !oNetAudioStream.Connect( g_sServerName, g_iServerPort ) )
if( !oNetAudioStream.Connect( g_sServerName, g_iServerPort, g_bUseUDP ) )
ITA_EXCEPT1( INVALID_PARAMETER, "Could not connect to net audio server" );
vstr::out() << "[ NetAudioTestClient ] Connected." << endl;
......
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