Commit 4289aaf0 authored by Anne Heimes's avatar Anne Heimes
Browse files

bugfix server

parent 3531b26a
...@@ -309,7 +309,7 @@ void CITANetAudioStreamingServer::SetTargetLatencySamples( const int iTargetLate ...@@ -309,7 +309,7 @@ void CITANetAudioStreamingServer::SetTargetLatencySamples( const int iTargetLate
ITA_EXCEPT1( MODAL_EXCEPTION, "Server not connected, client ring buffer unkown" ); ITA_EXCEPT1( MODAL_EXCEPTION, "Server not connected, client ring buffer unkown" );
if( m_pInputStream ) if( m_pInputStream )
if( m_iTargetLatencySamples < int( m_pInputStream->GetBlocklength() ) ) if ( iTargetLatency < int( m_pInputStream->GetBlocklength( ) ) )
ITA_EXCEPT1( INVALID_PARAMETER, "Target latency has to be at least the block size of the audio streaming at client side." ); ITA_EXCEPT1( INVALID_PARAMETER, "Target latency has to be at least the block size of the audio streaming at client side." );
m_iTargetLatencySamples = iTargetLatency; m_iTargetLatencySamples = iTargetLatency;
......
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
using namespace std; using namespace std;
string g_sServerName = "localhost"; string g_sServerName = "137.226.61.85";
int g_iServerPort = 12480; int g_iServerPort = 12480;
double g_dSampleRate = 44100.0; double g_dSampleRate = 44100.0;
int g_iBlockLength = 512; int g_iBlockLength = 32;
int g_iChannels = 1; int g_iChannels = 100;
int g_iTargetLatencySamples = 4 * g_iBlockLength; // 1.4512ms int g_iTargetLatencySamples = 10 * g_iBlockLength; // 1.4512ms
int g_iRingBufferSize = 2 * g_iTargetLatencySamples; int g_iRingBufferSize = 2 * g_iTargetLatencySamples;
int g_iSendingBlockLength = 8; int g_iSendingBlockLength = 8;
double g_dClientStatusMessageTimeout = 0.001; // seconds double g_dClientStatusMessageTimeout = 0.001; // seconds
......
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