Commit dc1fb0c0 authored by Anne Heimes's avatar Anne Heimes

bugfix Streaming Status

parent ceaa1585
...@@ -335,7 +335,6 @@ int CITANetAudioStream::Transmit( const ITASampleFrame& sfNewSamples, int iNumSa ...@@ -335,7 +335,6 @@ int CITANetAudioStream::Transmit( const ITASampleFrame& sfNewSamples, int iNumSa
{ {
// BufferFull // BufferFull
m_iStreamingStatus = BUFFER_OVERRUN; m_iStreamingStatus = BUFFER_OVERRUN;
oLog.iBufferStatus = 1;
#if NET_AUDIO_SHOW_TRAFFIC #if NET_AUDIO_SHOW_TRAFFIC
vstr::out() << "[ NetAudio ] Buffer overrun" << std::endl; vstr::out() << "[ NetAudio ] Buffer overrun" << std::endl;
#endif #endif
...@@ -347,14 +346,12 @@ int CITANetAudioStream::Transmit( const ITASampleFrame& sfNewSamples, int iNumSa ...@@ -347,14 +346,12 @@ int CITANetAudioStream::Transmit( const ITASampleFrame& sfNewSamples, int iNumSa
m_iStreamingStatus = BUFFER_OVERRUN; m_iStreamingStatus = BUFFER_OVERRUN;
m_iWriteCursor = m_iReadCursor; m_iWriteCursor = m_iReadCursor;
oLog.iBufferStatus = 2;
} }
else else
{ {
// write samples into ring buffer // write samples into ring buffer
m_sfRingBuffer.cyclic_write( sfNewSamples, iNumSamples, 0, iCurrentWriteCursor ); m_sfRingBuffer.cyclic_write( sfNewSamples, iNumSamples, 0, iCurrentWriteCursor );
m_bRingBufferFull = false; m_bRingBufferFull = false;
oLog.iBufferStatus = 1;
m_iStreamingStatus = STREAMING; m_iStreamingStatus = STREAMING;
#if NET_AUDIO_SHOW_TRAFFIC #if NET_AUDIO_SHOW_TRAFFIC
vstr::out() << "[ NetAudio ] Buffer write" << std::endl; vstr::out() << "[ NetAudio ] Buffer write" << std::endl;
...@@ -365,9 +362,6 @@ int CITANetAudioStream::Transmit( const ITASampleFrame& sfNewSamples, int iNumSa ...@@ -365,9 +362,6 @@ int CITANetAudioStream::Transmit( const ITASampleFrame& sfNewSamples, int iNumSa
if ( m_iWriteCursor == m_iReadCursor ) if ( m_iWriteCursor == m_iReadCursor )
{ {
m_bRingBufferFull = true; m_bRingBufferFull = true;
oLog.iBufferStatus = 1;
m_iStreamingStatus = BUFFER_OVERRUN;
#if NET_AUDIO_SHOW_TRAFFIC #if NET_AUDIO_SHOW_TRAFFIC
vstr::out() << "[ NetAudio ] Buffer overrun" << std::endl; vstr::out() << "[ NetAudio ] Buffer overrun" << std::endl;
#endif #endif
......
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