m,erge fixeses + conneced and paras worked

src/ITANetAudioMessage.cpp

@@ -8,19 +8,19 @@
 
 static int S_nMessageIds = 0;
 
-CITANetAudioMessage::CITANetAudioMessage( VistaSerializingToolset::ByteOrderSwapBehavior bSwapBuffers )
-	: m_vecIncomingBuffer( 2048 )
-	, m_oOutgoing( 2048 )
-	, m_pConnection( NULL )
+CITANetAudioMessage::CITANetAudioMessage(VistaSerializingToolset::ByteOrderSwapBehavior bSwapBuffers)
+: m_vecIncomingBuffer(2048)
+, m_oOutgoing(2048)
+, m_pConnection(NULL)
 {
-	m_oOutgoing.SetByteorderSwapFlag( bSwapBuffers );
-	m_oIncoming.SetByteorderSwapFlag( bSwapBuffers );
+	m_oOutgoing.SetByteorderSwapFlag(bSwapBuffers);
+	m_oIncoming.SetByteorderSwapFlag(bSwapBuffers);
 	ResetMessage();
 }
 
 void CITANetAudioMessage::ResetMessage()
 {
-	if( m_oIncoming.GetTailSize() > 0 )
+	if (m_oIncoming.GetTailSize() > 0)
 	{
 		std::cerr << "CITANetAudioMessage::ResetMessage() called before message was fully processed!" << std::endl;
 	}
@@ -28,17 +28,17 @@ void CITANetAudioMessage::ResetMessage()
 	// wait till sending is complete -> this prevents us
 	// from deleting the buffer while it is still being read
 	// by the connection
-	if( m_pConnection )
+	if (m_pConnection)
 		m_pConnection->WaitForSendFinish();
 
 	m_nMessageId = S_nMessageIds++;
 
 	m_oOutgoing.ClearBuffer();
-	m_oOutgoing.WriteInt32( 0 ); // size dummy
-	m_oOutgoing.WriteInt32( 0 ); // type dummy
-	m_oOutgoing.WriteInt32( 0 ); // ID
+	m_oOutgoing.WriteInt32(0); // size dummy
+	m_oOutgoing.WriteInt32(0); // type dummy
+	m_oOutgoing.WriteInt32(0); // ID
 
-	m_oIncoming.SetBuffer( NULL, 0 );
+	m_oIncoming.SetBuffer(NULL, 0);
 
 	m_nMessageType = CITANetAudioProtocol::NP_INVALID;
 	m_nAnswerType = CITANetAudioProtocol::NP_INVALID;
@@ -46,49 +46,49 @@ void CITANetAudioMessage::ResetMessage()
 	m_pConnection = NULL;
 }
 
-void CITANetAudioMessage::SetConnection( VistaConnectionIP* pConn )
+void CITANetAudioMessage::SetConnection(VistaConnectionIP* pConn)
 {
 	m_pConnection = pConn;
 }
 
 void CITANetAudioMessage::WriteMessage()
 {
-	VistaType::byte* pBuffer = ( VistaType::byte* ) m_oOutgoing.GetBuffer();
+	VistaType::byte* pBuffer = (VistaType::byte*) m_oOutgoing.GetBuffer();
 	VistaType::sint32 iSwapDummy;
 
 	// rewrite size dummy
-	iSwapDummy = m_oOutgoing.GetBufferSize() - sizeof( VistaType::sint32 );
-	if( m_oOutgoing.GetByteorderSwapFlag() )
-		VistaSerializingToolset::Swap4( &iSwapDummy );
-	memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
+	iSwapDummy = m_oOutgoing.GetBufferSize() - sizeof(VistaType::sint32);
+	if (m_oOutgoing.GetByteorderSwapFlag())
+		VistaSerializingToolset::Swap4(&iSwapDummy);
+	memcpy(pBuffer, &iSwapDummy, sizeof(VistaType::sint32));
 
-	pBuffer += sizeof( VistaType::sint32 );
+	pBuffer += sizeof(VistaType::sint32);
 
 	// rewrite type dummy
 	iSwapDummy = m_nMessageType;
-	if( m_oOutgoing.GetByteorderSwapFlag() )
-		VistaSerializingToolset::Swap4( &iSwapDummy );
-	memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
+	if (m_oOutgoing.GetByteorderSwapFlag())
+		VistaSerializingToolset::Swap4(&iSwapDummy);
+	memcpy(pBuffer, &iSwapDummy, sizeof(VistaType::sint32));
+
+	pBuffer += sizeof(VistaType::sint32);
 
-	pBuffer += sizeof( VistaType::sint32 );
-	
 	// rewrite messageid dummy
 	iSwapDummy = m_nMessageId;
-	if( m_oOutgoing.GetByteorderSwapFlag() )
-		VistaSerializingToolset::Swap4( &iSwapDummy );
-	memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
+	if (m_oOutgoing.GetByteorderSwapFlag())
+		VistaSerializingToolset::Swap4(&iSwapDummy);
+	memcpy(pBuffer, &iSwapDummy, sizeof(VistaType::sint32));
 
 	try
 	{
 		int iRawBufferSize = m_oOutgoing.GetBufferSize();
-		int nRet = m_pConnection->WriteRawBuffer( m_oOutgoing.GetBuffer(), iRawBufferSize );
+		int nRet = m_pConnection->WriteRawBuffer(m_oOutgoing.GetBuffer(), iRawBufferSize);
 		m_pConnection->WaitForSendFinish();
-		if( nRet != m_oOutgoing.GetBufferSize() )
-			ITA_EXCEPT1( NETWORK_ERROR, "Could not write the expected number of bytes" );
+		if (nRet != m_oOutgoing.GetBufferSize())
+			ITA_EXCEPT1(NETWORK_ERROR, "Could not write the expected number of bytes");
 	}
-	catch( VistaExceptionBase& ex )
+	catch (VistaExceptionBase& ex)
 	{
-		ITA_EXCEPT1( NETWORK_ERROR, ex.GetExceptionText() );
+		ITA_EXCEPT1(NETWORK_ERROR, ex.GetExceptionText());
 	}
 }
 
@@ -98,27 +98,27 @@ void CITANetAudioMessage::ReadMessage()
 	try
 	{
 		VistaType::sint32 nMessageSize;
-		int nReturn = m_pConnection->ReadInt32( nMessageSize );
-		
+		int nReturn = m_pConnection->ReadInt32(nMessageSize);
+
 		// we need at least the two protocol ints
-		assert( nMessageSize >= 2 * sizeof( VistaType::sint32 ) );
+		assert(nMessageSize >= 2 * sizeof(VistaType::sint32));
 
-		if( nMessageSize > ( int ) m_vecIncomingBuffer.size() )
-			m_vecIncomingBuffer.resize( nMessageSize );
+		if (nMessageSize > (int)m_vecIncomingBuffer.size())
+			m_vecIncomingBuffer.resize(nMessageSize);
 
-		nReturn = m_pConnection->ReadRawBuffer( &m_vecIncomingBuffer[ 0 ], nMessageSize );
-		if( nReturn != nMessageSize )
-			ITA_EXCEPT1( NETWORK_ERROR, "Protokoll error, Received less bytes than expected" );
+		nReturn = m_pConnection->ReadRawBuffer(&m_vecIncomingBuffer[0], nMessageSize);
+		if (nReturn != nMessageSize)
+			ITA_EXCEPT1(NETWORK_ERROR, "Protokoll error, Received less bytes than expected");
 
-		m_oIncoming.SetBuffer( &m_vecIncomingBuffer[ 0 ], nReturn );
+		m_oIncoming.SetBuffer(&m_vecIncomingBuffer[0], nReturn);
 
 		// DEBUG: std::cout << "Remainign Size after Mesage Read: " << m_pConnection->PendingDataSize() << std::endl;
 	}
-	catch( VistaExceptionBase& ex )
+	catch (VistaExceptionBase& ex)
 	{
-		ITA_EXCEPT1( UNKNOWN, ex.GetExceptionText() );
+		ITA_EXCEPT1(UNKNOWN, ex.GetExceptionText());
 	}
-	catch( ITAException& ex )
+	catch (ITAException& ex)
 	{
 		ex;
 	}
@@ -130,41 +130,41 @@ void CITANetAudioMessage::ReadMessage()
 
 void CITANetAudioMessage::WriteAnswer()
 {
-	VistaType::byte* pBuffer = ( VistaType::byte* )m_oOutgoing.GetBuffer();
+	VistaType::byte* pBuffer = (VistaType::byte*)m_oOutgoing.GetBuffer();
 	VistaType::sint32 iSwapDummy;
 
 	// rewrite size dummy
-	iSwapDummy = m_oOutgoing.GetBufferSize() - sizeof( VistaType::sint32 );
-	if( m_oOutgoing.GetByteorderSwapFlag() )
-		VistaSerializingToolset::Swap4( &iSwapDummy );
-	memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
+	iSwapDummy = m_oOutgoing.GetBufferSize() - sizeof(VistaType::sint32);
+	if (m_oOutgoing.GetByteorderSwapFlag())
+		VistaSerializingToolset::Swap4(&iSwapDummy);
+	memcpy(pBuffer, &iSwapDummy, sizeof(VistaType::sint32));
 
-	pBuffer += sizeof( VistaType::sint32 );
+	pBuffer += sizeof(VistaType::sint32);
 
 	// rewrite type dummy
 	iSwapDummy = m_nAnswerType;
-	if( m_oOutgoing.GetByteorderSwapFlag() )
-		VistaSerializingToolset::Swap4( &iSwapDummy );
-	memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
+	if (m_oOutgoing.GetByteorderSwapFlag())
+		VistaSerializingToolset::Swap4(&iSwapDummy);
+	memcpy(pBuffer, &iSwapDummy, sizeof(VistaType::sint32));
+
+	pBuffer += sizeof(VistaType::sint32);
 
-	pBuffer += sizeof( VistaType::sint32 );
-	
 	// rewrite message dummy
 	iSwapDummy = m_nMessageId;
-	if( m_oOutgoing.GetByteorderSwapFlag() )
-		VistaSerializingToolset::Swap4( &iSwapDummy );
-	memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
+	if (m_oOutgoing.GetByteorderSwapFlag())
+		VistaSerializingToolset::Swap4(&iSwapDummy);
+	memcpy(pBuffer, &iSwapDummy, sizeof(VistaType::sint32));
 
 	try
 	{
-		int nRet = m_pConnection->WriteRawBuffer( m_oOutgoing.GetBuffer(), m_oOutgoing.GetBufferSize() );
+		int nRet = m_pConnection->WriteRawBuffer(m_oOutgoing.GetBuffer(), m_oOutgoing.GetBufferSize());
 		m_pConnection->WaitForSendFinish();
-		if( nRet != m_oOutgoing.GetBufferSize() )
-			ITA_EXCEPT1( UNKNOWN, "Could not write the expected number of bytes" );
+		if (nRet != m_oOutgoing.GetBufferSize())
+			ITA_EXCEPT1(UNKNOWN, "Could not write the expected number of bytes");
 	}
-	catch( VistaExceptionBase& ex )
+	catch (VistaExceptionBase& ex)
 	{
-		ITA_EXCEPT1( UNKNOWN, ex.GetExceptionText() );
+		ITA_EXCEPT1(UNKNOWN, ex.GetExceptionText());
 	}
 }
 
@@ -176,38 +176,38 @@ void CITANetAudioMessage::ReadAnswer()
 		int nReturn;
 		try
 		{
-			nReturn = m_pConnection->ReadInt32( nMessageSize );
+			nReturn = m_pConnection->ReadInt32(nMessageSize);
 		}
-		catch( ... )
+		catch (...)
 		{
 			nReturn = -1; // Network connection error
 		}
 
-		if( nReturn != sizeof( VistaType::sint32 ) )
+		if (nReturn != sizeof(VistaType::sint32))
 		{
-			ITA_EXCEPT1( UNKNOWN, "Protokoll error, Received less bytes than expected" );
+			ITA_EXCEPT1(UNKNOWN, "Protokoll error, Received less bytes than expected");
 		}
 
 		// we need at least the two protocol types
-		assert( nMessageSize >= 2 * sizeof( VistaType::sint32 ) );
+		assert(nMessageSize >= 2 * sizeof(VistaType::sint32));
 
-		if( nMessageSize > ( int ) m_vecIncomingBuffer.size() )
-			m_vecIncomingBuffer.resize( nMessageSize );
+		if (nMessageSize > (int)m_vecIncomingBuffer.size())
+			m_vecIncomingBuffer.resize(nMessageSize);
 
 		// jst: hier nicht while( nReturn < nMessageSize) ReadRawBuffer??
-		nReturn = m_pConnection->ReadRawBuffer( &m_vecIncomingBuffer[ 0 ], nMessageSize );
-		if( nReturn != nMessageSize )
-			ITA_EXCEPT1( UNKNOWN, "Protokoll error, Received less bytes than expected" );
+		nReturn = m_pConnection->ReadRawBuffer(&m_vecIncomingBuffer[0], nMessageSize);
+		if (nReturn != nMessageSize)
+			ITA_EXCEPT1(UNKNOWN, "Protokoll error, Received less bytes than expected");
 
-		m_oIncoming.SetBuffer( &m_vecIncomingBuffer[ 0 ], nReturn );
+		m_oIncoming.SetBuffer(&m_vecIncomingBuffer[0], nReturn);
 	}
-	catch( VistaExceptionBase& ex )
+	catch (VistaExceptionBase& ex)
 	{
 		// Probable connection loss
 		return;
-		ITA_EXCEPT1( UNKNOWN, ex.GetExceptionText() );
+		ITA_EXCEPT1(UNKNOWN, ex.GetExceptionText());
 	}
-	catch( ITAException& ex )
+	catch (ITAException& ex)
 	{
 		std::string sErrorText = ex.ToString();
 	}
@@ -216,10 +216,10 @@ void CITANetAudioMessage::ReadAnswer()
 	{
 		m_nAnswerType = ReadInt(); // TODO: assert weg, daf�r Kontrolle falls Server crasht<
 		int nMessageID = ReadInt();
-		assert( nMessageID == m_nMessageId );
+		assert(nMessageID == m_nMessageId);
 		m_nMessageId = nMessageID;
 	}
-	catch( ITAException& ex )
+	catch (ITAException& ex)
 	{
 		std::cerr << "ITANetAudioMessage: Protocol error: " << ex << std::endl;
 	}
@@ -231,15 +231,15 @@ int CITANetAudioMessage::GetMessageType() const
 	return m_nMessageType;
 }
 
-void CITANetAudioMessage::SetMessageType( int nType )
+void CITANetAudioMessage::SetMessageType(int nType)
 {
-	assert( m_nMessageType == CITANetAudioProtocol::NP_INVALID ); // should only be set once
+	assert(m_nMessageType == CITANetAudioProtocol::NP_INVALID); // should only be set once
 	m_nMessageType = nType;
 }
 
-void CITANetAudioMessage::SetAnswerType( int nType )
+void CITANetAudioMessage::SetAnswerType(int nType)
 {
-	assert( m_nAnswerType == CITANetAudioProtocol::NP_INVALID ); // should only be set once
+	assert(m_nAnswerType == CITANetAudioProtocol::NP_INVALID); // should only be set once
 	m_nAnswerType = nType;
 }
 
@@ -260,88 +260,88 @@ int CITANetAudioMessage::GetOutgoingMessageSize() const
 
 bool CITANetAudioMessage::GetOutgoingMessageHasData() const
 {
-	return ( m_oOutgoing.GetBufferSize() > 4 * sizeof( VistaType::sint32 ) );
+	return (m_oOutgoing.GetBufferSize() > 4 * sizeof(VistaType::sint32));
 }
 
-void CITANetAudioMessage::WriteString( const std::string& sValue )
+void CITANetAudioMessage::WriteString(const std::string& sValue)
 {
-	m_oOutgoing.WriteInt32( ( VistaType::sint32 )sValue.size() );
-	if( !sValue.empty() ) m_oOutgoing.WriteString( sValue );
+	m_oOutgoing.WriteInt32((VistaType::sint32)sValue.size());
+	if (!sValue.empty()) m_oOutgoing.WriteString(sValue);
 }
 
-void CITANetAudioMessage::WriteInt( const int iValue )
+void CITANetAudioMessage::WriteInt(const int iValue)
 {
-	m_oOutgoing.WriteInt32( ( VistaType::sint32 )iValue );
+	m_oOutgoing.WriteInt32((VistaType::sint32)iValue);
 }
 
-void CITANetAudioMessage::WriteBool( const bool bValue )
+void CITANetAudioMessage::WriteBool(const bool bValue)
 {
-	m_oOutgoing.WriteBool( bValue );
+	m_oOutgoing.WriteBool(bValue);
 }
 
-void CITANetAudioMessage::WriteFloat( const float fValue )
+void CITANetAudioMessage::WriteFloat(const float fValue)
 {
-	m_oOutgoing.WriteFloat32( fValue );
+	m_oOutgoing.WriteFloat32(fValue);
 }
 
-void CITANetAudioMessage::WriteDouble( const double dValue )
+void CITANetAudioMessage::WriteDouble(const double dValue)
 {
-	m_oOutgoing.WriteFloat64( dValue );
+	m_oOutgoing.WriteFloat64(dValue);
 }
 
 std::string CITANetAudioMessage::ReadString()
 {
 	VistaType::sint32 nSize;
-	int nReturn = m_oIncoming.ReadInt32( nSize );
-	assert( nReturn == sizeof( VistaType::sint32 ) );
+	int nReturn = m_oIncoming.ReadInt32(nSize);
+	assert(nReturn == sizeof(VistaType::sint32));
 
 	// Empty string?
-	if( nSize == 0 ) return "";
+	if (nSize == 0) return "";
 
 	std::string sValue;
-	nReturn = m_oIncoming.ReadString( sValue, nSize );
-	assert( nReturn == nSize );
+	nReturn = m_oIncoming.ReadString(sValue, nSize);
+	assert(nReturn == nSize);
 	return sValue;
 }
 
 int CITANetAudioMessage::ReadInt()
 {
 	VistaType::sint32 nValue;
-	int nReturn = m_oIncoming.ReadInt32( nValue );
-	if( nReturn == -1 )
-		ITA_EXCEPT1( UNKNOWN, "Could not read integer value from incoming message" );
-	assert( nReturn == sizeof( VistaType::sint32 ) );
+	int nReturn = m_oIncoming.ReadInt32(nValue);
+	if (nReturn == -1)
+		ITA_EXCEPT1(UNKNOWN, "Could not read integer value from incoming message");
+	assert(nReturn == sizeof(VistaType::sint32));
 	return nValue;
 }
 
 bool CITANetAudioMessage::ReadBool()
 {
 	bool bValue;
-	int nReturn = m_oIncoming.ReadBool( bValue );
-	assert( nReturn == sizeof( bool ) );
+	int nReturn = m_oIncoming.ReadBool(bValue);
+	assert(nReturn == sizeof(bool));
 	return bValue;
 }
 float CITANetAudioMessage::ReadFloat()
 {
 	float fValue;
-	int nReturn = m_oIncoming.ReadFloat32( fValue );
-	assert( nReturn == sizeof( float ) );
+	int nReturn = m_oIncoming.ReadFloat32(fValue);
+	assert(nReturn == sizeof(float));
 	return fValue;
 }
 double CITANetAudioMessage::ReadDouble()
 {
 	double dValue;
-	int nReturn = m_oIncoming.ReadFloat64( dValue );
-	assert( nReturn == sizeof( double ) );
+	int nReturn = m_oIncoming.ReadFloat64(dValue);
+	assert(nReturn == sizeof(double));
 	return dValue;
 }
 
 
-void CITANetAudioMessage::WriteException( const ITAException& oException )
+void CITANetAudioMessage::WriteException(const ITAException& oException)
 {
-	WriteInt( oException.iErrorCode );
-	WriteString( oException.sModule );
-	WriteString( oException.sReason );
+	WriteInt(oException.iErrorCode);
+	WriteString(oException.sModule);
+	WriteString(oException.sReason);
 }
 
 ITAException CITANetAudioMessage::ReadException()
@@ -349,7 +349,7 @@ ITAException CITANetAudioMessage::ReadException()
 	int iErrorCode = ReadInt();
 	std::string sModule = ReadString();
 	std::string sReason = ReadString();
-	return ITAException( iErrorCode, sModule, sReason );
+	return ITAException(iErrorCode, sModule, sReason);
 }
 
 VistaConnectionIP* CITANetAudioMessage::GetConnection() const
@@ -361,20 +361,20 @@ void CITANetAudioMessage::ClearConnection() {
 	m_pConnection = NULL;
 }
 
-void CITANetAudioMessage::WriteIntVector( const std::vector<int> viData )
+void CITANetAudioMessage::WriteIntVector(const std::vector<int> viData)
 {
-	int iSize = ( int ) viData.size();
-	WriteInt( iSize );
-	for( int i = 0; i<iSize; i++ )
-		WriteInt( viData[ i ] );
+	int iSize = (int)viData.size();
+	WriteInt(iSize);
+	for (int i = 0; i < iSize; i++)
+		WriteInt(viData[i]);
 }
 
 std::vector<int> CITANetAudioMessage::ReadIntVector()
 {
 	std::vector<int> viData;
 	int iSize = ReadInt();
-	for( int i = 0; i<iSize; i++ )
-		viData.push_back( ReadInt() );
+	for (int i = 0; i < iSize; i++)
+		viData.push_back(ReadInt());
 
 	return viData;
 }
@@ -390,9 +390,51 @@ CITANetAudioProtocol::StreamingParameters CITANetAudioMessage::ReadStreamingPara
 	return oParams;
 }
 
-void CITANetAudioMessage::WriteStreamingParameters( const CITANetAudioProtocol::StreamingParameters & oParams )
+void CITANetAudioMessage::WriteStreamingParameters(const CITANetAudioProtocol::StreamingParameters & oParams)
 {
-	WriteInt( oParams.iChannels );
-	WriteDouble( oParams.dSampleRate );
-	WriteInt( oParams.iBlockSize );
+	WriteInt(oParams.iChannels);
+	WriteDouble(oParams.dSampleRate);
+	WriteInt(oParams.iBlockSize);
 }
+
+int CITANetAudioMessage::ReadRingBufferSize()
+{
+	return ReadInt();
+}
+void CITANetAudioMessage::WriteRingBufferSize(const int iBufferSize)
+{
+	WriteInt(iBufferSize);
+}
+int CITANetAudioMessage::ReadRingBufferFree()
+{
	return ReadInt();
+}
+void CITANetAudioMessage::WriteRingBufferFree(const int iBufferFree)
+{
+	WriteInt(iBufferFree);
+}
+void CITANetAudioMessage::ReadSampleFrame(ITASampleFrame* pSampleFrame)
+{
+	int iChannels = ReadInt();
+	int iSamples = ReadInt();
+	if (pSampleFrame->channels() != iChannels || pSampleFrame->GetLength() != iSamples)
+		pSampleFrame->init(iChannels, iSamples, false);
+	for (int i = 0; i < iChannels; i++)
+	{
+		for (int j = 0; j < iSamples; j++)
+		{
+			(*pSampleFrame)[i][j] = ReadFloat();
+		}
+	}
+}
+void CITANetAudioMessage::WriteSampleFrame(ITASampleFrame* pSamples)
+{
+	WriteInt(pSamples->channels());
+	WriteInt(pSamples->GetLength());
+	for (int i = 0; i < pSamples->channels(); i++)
+	{
+		for (int j = 0; j < pSamples->GetLength(); j++)
+		{
+			WriteFloat((*pSamples)[i][j]);
+		}
+	}
+}

src/ITANetAudioServer.cpp

@@ -31,6 +31,7 @@ CITANetAudioServer::~CITANetAudioServer()
 {
 	delete m_pConnection;
 	delete m_pServer;
+	delete m_pSocket;
 }
 
 std::string CITANetAudioServer::GetServerAddress() const

src/ITANetAudioStream.cpp

@@ -45,7 +45,7 @@ const float* CITANetAudioStream::GetBlockPointer( unsigned int uiChannel, const
 		m_sfOutputStreamBuffer[uiChannel].cyclic_write(&m_sfRingBuffer[uiChannel], 
 			m_sfOutputStreamBuffer.GetLength(), m_iReadCursor, iCurrentWritePointer);
 	} else {
-		// in diesem Block alle Kanaele auf 0 setzen
+		// diesen Block auf 0 setzen
 		m_sfOutputStreamBuffer[uiChannel].Zero();
 	}
 	
@@ -63,14 +63,14 @@ int CITANetAudioStream::Transmit( const ITASampleFrame& sfNewSamples, int iNumSa
 {
 	int iCurrentReadCursor = m_iReadCursor;
 
-	//kopiert Samples in den RingBuffer
+	// write samples in the buffer
 	m_sfRingBuffer.cyclic_write(sfNewSamples, iNumSamples, 
 		iCurrentReadCursor, m_iWriteCursor);
 
-	// Schreibpointer weiter setzen
+	// set write curser
 	m_iWriteCursor = ( m_iWriteCursor + iNumSamples ) % m_sfRingBuffer.GetLength();
 
-	// Gibt freien Platz im RingBuffer zurueck
+	// return free BufferSize
 	if (iCurrentReadCursor > m_iWriteCursor) {
 		return m_iWriteCursor - iCurrentReadCursor;
 	}

tests/NetAudio/ITANetAudioStreamingServerTest.cpp

@@ -23,7 +23,7 @@ int main( int , char** )
 	oStreamingServer.Start( g_sServerName, g_iServerPort );
 
 	int iKey;
-	cin >> iKey;
+	std::cin >> iKey;
 	
 	return 0;
 }