From e941e65ffc85fff6efa47640251f287432c74076 Mon Sep 17 00:00:00 2001 From: Anne Heimes Date: Tue, 21 Feb 2017 13:44:34 +0100 Subject: [PATCH] bugfix recivedByteTatal Error --- include/ITANetAudioMessage.h | 2 ++ src/ITANetAudioMessage.cpp | 10 +++++----- src/ITANetAudioStream.cpp | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/ITANetAudioMessage.h b/include/ITANetAudioMessage.h index c0ee695..68fdc82 100644 --- a/include/ITANetAudioMessage.h +++ b/include/ITANetAudioMessage.h @@ -97,6 +97,8 @@ public: private: int m_nMessageType; int m_nMessageId; + unsigned long m_iBytesReceivedTotal; + VistaByteBufferSerializer m_oOutgoing; //!< Serialization buffer for messages VistaByteBufferDeSerializer m_oIncoming; //!< Deserialization buffer for messages std::vector< VistaType::byte > m_vecIncomingBuffer; // Net IO buffer diff --git a/src/ITANetAudioMessage.cpp b/src/ITANetAudioMessage.cpp index 0260116..d67bcd0 100644 --- a/src/ITANetAudioMessage.cpp +++ b/src/ITANetAudioMessage.cpp @@ -144,16 +144,16 @@ bool CITANetAudioMessage::ReadMessage( int timeout) m_vecIncomingBuffer.resize( nMessagePayloadSize ); // Receive all incoming data (potentially splitted) - int iBytesReceivedTotal = 0; - while( nMessagePayloadSize > iBytesReceivedTotal ) + m_iBytesReceivedTotal = 0; + while (nMessagePayloadSize > m_iBytesReceivedTotal) { int iIncommingBytes = m_pConnection->WaitForIncomingData( 0 ); int iBytesReceived; if ( nMessagePayloadSize < iIncommingBytes ) - iBytesReceived = m_pConnection->Receive( &m_vecIncomingBuffer[ iBytesReceivedTotal ], nMessagePayloadSize - iBytesReceivedTotal ); + iBytesReceived = m_pConnection->Receive(&m_vecIncomingBuffer[m_iBytesReceivedTotal], nMessagePayloadSize - m_iBytesReceivedTotal); else - iBytesReceived = m_pConnection->Receive( &m_vecIncomingBuffer[ iBytesReceivedTotal ], iIncommingBytes ); - iBytesReceivedTotal += iBytesReceived; + iBytesReceived = m_pConnection->Receive(&m_vecIncomingBuffer[m_iBytesReceivedTotal], iIncommingBytes); + m_iBytesReceivedTotal += iBytesReceived; #if NET_AUDIO_SHOW_TRAFFIC vstr::out() << "[ CITANetAudioMessage ] " << std::setw( 3 ) << std::floor( iBytesReceivedTotal / float( nMessagePayloadSize ) * 100.0f ) << "% transmitted" << std::endl; #endif diff --git a/src/ITANetAudioStream.cpp b/src/ITANetAudioStream.cpp index cfc6d48..462cbae 100644 --- a/src/ITANetAudioStream.cpp +++ b/src/ITANetAudioStream.cpp @@ -323,7 +323,7 @@ void CITANetAudioStream::IncrementBlockPointer() oLog.iFreeSamples = GetRingBufferFreeSamples( ); m_pStreamLogger->log( oLog ); - m_pNetAudioStreamingClient->TriggerBlockIncrement(); + //m_pNetAudioStreamingClient->TriggerBlockIncrement(); } int CITANetAudioStream::Transmit( const ITASampleFrame& sfNewSamples, int iNumSamples ) -- GitLab