Merge branch 'ba_2016_heimes' of https://git.rwth-aachen.de/ita/ITADataSources into ba_2016_heimes

# Conflicts:
#	include/ITANetAudioStreamingClient.h
#	src/ITANetAudioStreamingClient.cpp

CMakeLists.txt

-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 project( ITADataSources )
 

apps/ita_whad/CMakeLists.txt

@@ -6,13 +6,13 @@ include( VistaCommon )
 
 vista_use_package( ITADataSources REQUIRED FIND_DEPENDENCIES )
 
-if( TA_DATA_SOURCES_WITH_INTEGRATED_ASIO )
+if( ITA_DATA_SOURCES_WITH_INTEGRATED_ASIO )
 	add_definitions( "-DITA_WHAD_WITH_ASIO" )
-endif( TA_DATA_SOURCES_WITH_INTEGRATED_ASIO )
+endif( )
 
-if( TA_DATA_SOURCES_WITH_INTEGRATED_PORTAUDIO )
+if( ITA_DATA_SOURCES_WITH_INTEGRATED_PORTAUDIO )
 	add_definitions( "-DITA_WHAD_WITH_PORTAUDIO" )
-endif( TA_DATA_SOURCES_WITH_INTEGRATED_PORTAUDIO )
+endif( )
 
 add_executable( ita_whad main.cpp )
 target_link_libraries( ita_whad ${VISTA_USE_PACKAGE_LIBRARIES} )

apps/ita_whad/main.cpp

@@ -31,26 +31,55 @@ int main( int, char** )
 
 #ifdef ITA_WHAD_WITH_ASIO
 
-	string sFileName = "ita_whad_asio.txt";
-	FILE* file = fopen( sFileName.c_str(), "w" );
+	string sASIOFileName = "ita_whad_asio.txt";
+	FILE* PASIOFile = fopen( sASIOFileName.c_str(), "w" );
 
 	ITAsioInitializeLibrary();
 
-	long lDrivers = ITAsioGetNumDrivers();
+	long lASIODrivers = ITAsioGetNumDrivers();
 
-	if( lDrivers == 0 )
+	if( lASIODrivers == 0 )
 		cerr << "Warning: no ASIO drivers found." << endl;
 
-	for( long i = 0; i < lDrivers; i++ )
+	cout << " ### ASIO ### " << endl;
+	for( long i = 0; i < lASIODrivers; i++ )
 	{
-		cout << "[" << i+1 << "] \"" << ITAsioGetDriverName(i) << "\"" << endl;
+		cout << "[" << i + 1 << "] \"" << ITAsioGetDriverName( i ) << "\"" << endl;
 	}
+	cout << endl;
 
 	ITAsioFinalizeLibrary();
 
-	fclose( file );
+	fclose( PASIOFile );
 
 #endif // ITA_WHAD_WITH_ASIO
+#ifdef ITA_WHAD_WITH_PORTAUDIO
+
+	string sPAFileName = "ita_whad_portaudio.txt";
+	FILE* pPAFile = fopen( sPAFileName.c_str(), "w" );
+
+	ITAPortaudioInterface oITAPA( 44.1e3, 1024 );
+	oITAPA.Initialize();
+	int iPANumDevices = oITAPA.GetNumDevices();
+	int iPADefaultIn = oITAPA.GetDefaultInputDevice();
+	int iPADefaultOut = oITAPA.GetDefaultOutputDevice();
+
+	cout << " ### Portaudio ### " << endl;
+	for( int i = 0; i < iPANumDevices; i++ )
+	{
+		string sExtra = "";
+		if( i == iPADefaultIn || i == iPADefaultOut )
+			sExtra = " *";
+
+		cout << "[" << i + 1 << "] \"" << oITAPA.GetDeviceName( i ) << "\"" << sExtra << endl;
+	}
+	cout << endl;
+
+	oITAPA.Finalize();
+
+	fclose( pPAFile );
+
+#endif // ITA_WHAD_WITH:PORTAUDIO
 
 	return 0;
 }

include/ITABufferDataSource.h

@@ -151,6 +151,18 @@ public:
 	//! Wiederholung Ein-/Ausschalten
 	void SetLoopMode(bool bLoopMode);
 
+	//! Sets the looping mode
+	/**
+	  * @param[in] bLoopingEnabled True means looping, false will play until EOF
+	  */
+	void SetIsLooping( bool bLoopingEnabled );
+	
+	//! Looping mode getter
+	/**
+	  * @return True means looping, false will play until EOF
+  	  */
+	bool GetIsLooping();
+
 	//! Arbeitsbereich (region of interest) festlegen
 	/**
 	 * Legt den Arbeitsbereich fest, d.h. das Interval in den Quellendaten, aus dem die

include/ITADataSourceDelegator.h

@@ -16,7 +16,7 @@
 #ifndef _ITADATASOURCEDELEGATOR_H_
 #define _ITADATASOURCEDELEGATOR_H_
 
-#include <ITADatasource.h>
+#include <ITADataSource.h>
 
 /**
  * Diese Klasse implementiert die Schnittstelle der ITADatasource, stellt die

include/ITAFileDataSource.h

@@ -49,7 +49,8 @@
  *
  * \ingroup datasources
  */
-class ITA_DATA_SOURCES_API ITAFileDatasource : public ITABufferDatasource {
+class ITA_DATA_SOURCES_API ITAFileDatasource : public ITABufferDatasource
+{
 public:
 	//! Konstruktor
 	/**

include/ITANetAudioMessage.h

@@ -55,9 +55,8 @@ public:
 	void ClearConnection();
 
 	void WriteMessage();
-	void ReadMessage();
-	void WriteAnswer();
-	void ReadAnswer();
+	// Returns false if no incomming data
+	bool ReadMessage( int timeout );
 
 	void ResetMessage();
 
@@ -66,9 +65,7 @@ public:
 	bool GetOutgoingMessageHasData() const;
 
 	void SetMessageType( int nType );
-	void SetAnswerType( int nType );
 	int GetMessageType() const;
-	int GetAnswerType() const;
 
 
 	void WriteInt( const int );
@@ -100,12 +97,16 @@ public:
 private:
 	int m_nMessageType;
 	int m_nMessageId;
-	int m_nAnswerType;
+	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
 
 	VistaConnectionIP* m_pConnection;
+
+	//DEBUG
+	int i;
 };
 
 #endif // INCLUDE_WATCHER_ITA_NET_AUDIO_MESSAGE

include/ITANetAudioProtocol.h

@@ -47,21 +47,14 @@ class CITANetAudioStream;
 class ITA_DATA_SOURCES_API CITANetAudioProtocol
 {
 public:
-	static const int NET_AUDIO_VERSION = 1;
-
-	static const int NP_INVALID = -1;
-	static const int NP_GET_VERSION_INFO = 1;
-
 	static const int NP_CLIENT_OPEN = 100;
 	static const int NP_CLIENT_CLOSE = 101;
-	static const int NP_CLIENT_WAITING_FOR_SAMPLES = 111;
+	static const int NP_CLIENT_SENDING_RINGBUFFER_FREE_SAMPLES = 111;
 
-	static const int NP_SERVER_CLOSE = 200;
-	static const int NP_SERVER_OPEN = 201;
-	static const int NP_SERVER_GET_RINGBUFFER_SIZE = 210;
-	static const int NP_SERVER_GET_RINGBUFFER_FREE = 211;
-	static const int NP_SERVER_WAITING_FOR_TRIGGER = 221;
-	static const int NP_SERVER_SEND_SAMPLES = 222;
+	static const int NP_SERVER_OPEN = 200;
+	static const int NP_SERVER_CLOSE = 201;
+	static const int NP_SERVER_GET_RINGBUFFER_FREE_SAMPLES = 211;
+	static const int NP_SERVER_SENDING_SAMPLES = 222;
 
 	inline CITANetAudioProtocol() {};
 	inline ~CITANetAudioProtocol() {};
@@ -71,17 +64,25 @@ public:
 		int iChannels;
 		double dSampleRate;
 		int iBlockSize;
+		int iRingBufferSize;
+		int iTargetSampleLatency;
 
 		inline StreamingParameters()
 		{
 			iChannels = 0;
 			dSampleRate = 0.0f;
 			iBlockSize = 0;
+			iRingBufferSize = 0;
+			iTargetSampleLatency = 0;
 		};
 
 		inline bool operator==( const StreamingParameters& rhs )
 		{
-			if( ( iChannels == rhs.iChannels ) && ( dSampleRate == rhs.dSampleRate ) && ( iBlockSize == rhs.iBlockSize ) )
+			if ( ( iChannels == rhs.iChannels ) 
+				&& ( dSampleRate == rhs.dSampleRate ) 
+				&& (iBlockSize == rhs.iBlockSize)
+				&& (iRingBufferSize == rhs.iRingBufferSize)
+				&& (iTargetSampleLatency == rhs.iTargetSampleLatency))
 				return true;
 			else
 				return false;

include/ITANetAudioStream.h

@@ -34,6 +34,7 @@ using namespace std;
 class CITANetAudioStreamingClient;
 class ITABufferedDataLoggerImplStream;
 class ITABufferedDataLoggerImplNet;
+class ITABufferedDataLoggerImplAudio;
 
 //! Network audio stream
 /**
@@ -97,11 +98,33 @@ public:
 	float GetAllowedLatencySeconds() const;
 	int GetAllowedLatencySamples() const;
 	
+	//! Sets the minimal latency possible
+	/**
+	  * Real-time network audio is considered to process at lowest latency possible.
+	  * However, this implementation requires at least one block. Hence latency is
+	  * depending on sampling rate and block length.
+	  *
+	  * @sa GetMinimumLatencySamples()
+	  * @sa GetMinimumLatencySamples()
+	  */
 	float GetMinimumLatencySeconds() const;
+
 	float GetMaximumLatencySeconds() const;
 	int GetMinimumLatencySamples() const;
 	int GetMaximumLatencySamples() const;
 
+	//! Sets the latency for real-time processing
+	/**
+	  * Real-time network audio is considered to process at lowest latency possible.
+	  * However, this implementation requires at least one block. Hence latency is
+	  * depending on sampling rate and block length. This method basically
+	  * sets the minimum allowed latency to this value.
+	  *
+	  * @sa GetMinimumLatencySeconds()
+	  * @sa SetAllowedLatencySeconds()
+	  */
+	void SetLatencyForRealtime();
+
 	//! Returns (static) size of ring buffer
 	/**
 	  * @return Number of maximum samples that can be hold by internal ring buffer
@@ -183,11 +206,12 @@ private:
 	int m_iWriteCursor; //!< Cursor where samples will be fed into ring buffer from net audio producer (always ahead)
 	bool m_bRingBufferFull; //!< Indicator if ring buffer is full (and read cursor equals write cursor)
 	ITASampleFrame m_sfRingBuffer; //!< Ring buffer
-	int m_iTargetSampleLatency; //!< Maximum allowed samples / target sample latency
+	int m_iTargetSampleLatencyServer; //!< Maximum allowed samples / target sample latency
 
 	int m_iStreamingStatus; //!< Current streaming status
 	double m_dLastStreamingTimeCode;
 
+	ITABufferedDataLoggerImplAudio* m_pAudioLogger; //!< Logging for the audio stream
 	ITABufferedDataLoggerImplStream* m_pStreamLogger; //!< Logging for the audio stream
 	ITABufferedDataLoggerImplNet* m_pNetLogger; //!< Logging for the network stream
 	int iAudioStreamingBlockID; //!< Audio streaming block id

include/ITANetAudioStreamingClient.h

@@ -36,6 +36,7 @@ class CITANetAudioClient;
 class CITANetAudioMessage;
 class CITANetAudioProtocol;
 class CITANetAudioStream;
+class ITABufferedDataLoggerImplClient;
 
 //! Network audio streaming client
 /**

include/ITANetAudioStreamingServer.h

@@ -39,6 +39,8 @@ class CITANetAudioProtocol;
 class CITANetAudioServer;
 class CITANetAudioMessage;
 class VistaTCPSocket;
+class ITABufferedDataLoggerImplServer;
+
 
 //! Network audio sample server (for connecting a net audio stream)
 /**
@@ -88,8 +90,12 @@ private:
 	CITANetAudioProtocol::StreamingParameters m_oServerParams;
 	CITANetAudioMessage* m_pMessage;
 
+	int iServerBlockId;
+	ITABufferedDataLoggerImplServer* m_pServerLogger;
+
 	int m_iUpdateStrategy;
 	int m_iClientRingBufferFreeSamples;
+	int m_iMaxSendBlocks;
 
 	friend class CITANetAudioServer;
 };

include/ITAPortaudioInterface.h

@@ -40,7 +40,7 @@ class ITA_DATA_SOURCES_API ITAPortaudioInterface
 {
 public:
 	//! ITAPortaudio error code table
-	typedef enum ITA_PA_ERRORCODE
+	enum ITA_PA_ERRORCODE
 	{
 		//! Portaudio/ITAPortaudio no error
 		ITA_PA_NO_ERROR=0,
@@ -161,7 +161,7 @@ public:
 	};
 
 	//! Portaudio available host APIs
-	typedef enum ITA_PA_HOST_APIS
+	enum ITA_PA_HOST_APIS
 	{
 		ITA_PA_DIRECT_SOUND = 1,	//!< Windows DirectSound
 		ITA_PA_MME = 2,				//!< Windows MME

src/ITABufferDataSource.cpp

@@ -176,6 +176,16 @@ void  ITABufferDatasource::SetCursor(unsigned int uiNewCursor) {
 	m_iCursor = (int) uiNewCursor;
 }
 
+void ITABufferDatasource::SetIsLooping( bool bEnabled )
+{
+	SetLoopMode( bEnabled );
+}
+
+bool ITABufferDatasource::GetIsLooping()
+{
+	return GetLoopMode();
+}
+
 bool ITABufferDatasource::GetLoopMode() {
 	/* TODO: Diese Implementierung ist NICHT THREAD-SAFE.
              m_bLoopMode kann durch IncrementReadPointer modifiziert werden,
@@ -190,6 +200,7 @@ void ITABufferDatasource::SetLoopMode(bool bLoopMode) {
 	m_bChangeLoopMode = true;
 }
 
+
 bool ITABufferDatasource::IsPaused() const {
 	return m_bPaused;
 }

src/ITANetAudioMessage.cpp

@@ -4,7 +4,10 @@
 #include <VistaInterProcComm/Connections/VistaConnectionIP.h>
 #include <VistaBase/VistaExceptionBase.h>
 #include <VistaBase/VistaStreamUtils.h>
+#include <ITAClock.h>
 
+#include <cstring>
+#include <algorithm>
 #include <cassert>
 #include <iostream>
 #include <iomanip>
@@ -15,6 +18,7 @@ CITANetAudioMessage::CITANetAudioMessage( VistaSerializingToolset::ByteOrderSwap
 	: m_vecIncomingBuffer( 2048 )
 	, m_oOutgoing( 2048 )
 	, m_pConnection( NULL )
+	, m_iBytesReceivedTotal(0)
 {
 	m_oOutgoing.SetByteorderSwapFlag( bSwapBuffers );
 	m_oIncoming.SetByteorderSwapFlag( bSwapBuffers );
@@ -41,10 +45,9 @@ void CITANetAudioMessage::ResetMessage()
 
 	m_oIncoming.SetBuffer( NULL, 0 );
 
-	m_nMessageType = CITANetAudioProtocol::NP_INVALID;
-	m_nAnswerType = CITANetAudioProtocol::NP_INVALID;
+	m_nMessageType = -1;
 
-	m_pConnection = NULL;
+	//m_pConnection = NULL;
 
 #if NET_AUDIO_SHOW_TRAFFIC
 	vstr::out() << "CITANetAudioMessage [Preparing] (id=" << std::setw( 4 ) << m_nMessageId << ")" << std::endl;
@@ -65,7 +68,7 @@ void CITANetAudioMessage::WriteMessage()
 	iSwapDummy = m_oOutgoing.GetBufferSize() - sizeof( VistaType::sint32 );
 	if( m_oOutgoing.GetByteorderSwapFlag() )
 		VistaSerializingToolset::Swap4( &iSwapDummy );
-	memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
+	std::memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
 
 	pBuffer += sizeof( VistaType::sint32 );
 
@@ -73,7 +76,7 @@ void CITANetAudioMessage::WriteMessage()
 	iSwapDummy = m_nMessageType;
 	if( m_oOutgoing.GetByteorderSwapFlag() )
 		VistaSerializingToolset::Swap4( &iSwapDummy );
-	memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
+	std::memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
 
 	pBuffer += sizeof( VistaType::sint32 );
 
@@ -81,7 +84,7 @@ void CITANetAudioMessage::WriteMessage()
 	iSwapDummy = m_nMessageId;
 	if( m_oOutgoing.GetByteorderSwapFlag() )
 		VistaSerializingToolset::Swap4( &iSwapDummy );
-	memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
+	std::memcpy( pBuffer, &iSwapDummy, sizeof( VistaType::sint32 ) );
 
 #if NET_AUDIO_SHOW_TRAFFIC
 	vstr::out() << "CITANetAudioMessage [  Writing] " << m_nMessageType << " (id=" << std::setw( 4 ) << m_nMessageId << ")" << std::endl;
@@ -98,8 +101,8 @@ void CITANetAudioMessage::WriteMessage()
 #endif
 
 		m_pConnection->WaitForSendFinish();
-		if( nRet != m_oOutgoing.GetBufferSize() )
-			VISTA_THROW( "ITANetAudioMessage: could not send all data from output buffer via network connection", 255 );
+		//if( nRet != m_oOutgoing.GetBufferSize() )
+			//VISTA_THROW( "ITANetAudioMessage: could not send all data from output buffer via network connection", 255 );
 	}
 	catch (VistaExceptionBase& ex)
 	{
@@ -108,13 +111,21 @@ void CITANetAudioMessage::WriteMessage()
 }
 
 
-void CITANetAudioMessage::ReadMessage()
+bool CITANetAudioMessage::ReadMessage( int timeout)
 {
 #if NET_AUDIO_SHOW_TRAFFIC
 	vstr::out() << "CITANetAudioMessage [ Reading ] Waiting for incoming data" << std::endl;
 #endif
-	long nIncomingBytes = m_pConnection->WaitForIncomingData( 0 );
-	assert( nIncomingBytes >= 4 ); // we need at least the size of message
+	// WaitForIncomming Data int in ca ms
+	long nIncomingBytes = m_pConnection->WaitForIncomingData( timeout );
+	// TODO Timer entfernen
+	if (nIncomingBytes == -1)
+		return false;
+	else
+		int a = 5;
+
+	if (timeout != 0)
+		nIncomingBytes = m_pConnection->WaitForIncomingData( 0 );
 #if NET_AUDIO_SHOW_TRAFFIC
 	vstr::out() << "CITANetAudioMessage [ Reading ] " << nIncomingBytes << " bytes incoming" << std::endl;
 #endif
@@ -125,23 +136,30 @@ void CITANetAudioMessage::ReadMessage()
 #if NET_AUDIO_SHOW_TRAFFIC
 	vstr::out() << "CITANetAudioMessage [ Reading ] Expecting " << nMessagePayloadSize << " bytes message payload" << std::endl;
 #endif
+	if (nMessagePayloadSize <= 0)
+		return false;
 	// we need at least the two protocol ints
-	assert( nMessagePayloadSize >= 2 * sizeof( VistaType::sint32 ) );
+	//assert( nMessagePayloadSize >= 2 * sizeof( VistaType::sint32 ) );
 
 	if( nMessagePayloadSize > ( int ) m_vecIncomingBuffer.size() )
 		m_vecIncomingBuffer.resize( nMessagePayloadSize );
 	
 	// Receive all incoming data (potentially splitted)
-	int iBytesReceivedTotal = 0;
-	while( nMessagePayloadSize != iBytesReceivedTotal )
+	
+	while (nMessagePayloadSize > m_iBytesReceivedTotal)
 	{
 		int iIncommingBytes = m_pConnection->WaitForIncomingData( 0 );
-		int iBytesReceived = m_pConnection->Receive( &m_vecIncomingBuffer[ iBytesReceivedTotal ], iIncommingBytes );
-		iBytesReceivedTotal += iBytesReceived;
+		int iBytesReceived;
+		if ( nMessagePayloadSize < iIncommingBytes )
+			iBytesReceived = m_pConnection->Receive(&m_vecIncomingBuffer[m_iBytesReceivedTotal], nMessagePayloadSize - m_iBytesReceivedTotal);
+		else
+			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
 	}
+	m_iBytesReceivedTotal = 0;
 
 	// Transfer data into members
 	m_oIncoming.SetBuffer( &m_vecIncomingBuffer[ 0 ], nMessagePayloadSize, false );
@@ -151,93 +169,7 @@ void CITANetAudioMessage::ReadMessage()
 #if NET_AUDIO_SHOW_TRAFFIC
 	vstr::out() << "CITANetAudioMessage [ Reading ] Finished receiving " << m_nMessageType << " (id=" << std::setw( 4 ) << m_nMessageId << ")" << std::endl;
 #endif
-}
-
-void CITANetAudioMessage::WriteAnswer()
-{
-
-#if NET_AUDIO_SHOW_TRAFFIC
-	vstr::out() << "CITANetAudioMessage [ Answering] to " << m_nMessageType << " with " << m_nAnswerType << " (id=" << std::setw( 4 ) << m_nMessageId << ")" << std::endl;
-#endif
-
-	assert( m_nAnswerType != CITANetAudioProtocol::NP_INVALID );
-
-	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 ) );
-
-	pBuffer += sizeof( VistaType::sint32 );
-
-	// rewrite type dummy
-	iSwapDummy = m_nAnswerType;
-	if( m_oOutgoing.GetByteorderSwapFlag() )
-		VistaSerializingToolset::Swap4( &iSwapDummy );
-	memcpy( pBuffer, &iSwapDummy, 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 ) );
-
-	int nRet = m_pConnection->Send( 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" );
-}
-
-void CITANetAudioMessage::ReadAnswer()
-{
-
-#if NET_AUDIO_SHOW_TRAFFIC
-	vstr::out() << "CITANetAudioMessage [ Reading] yet unkown answer from initial message type " << m_nMessageType << " (id=" << std::setw( 4 ) << m_nMessageId << ") OK" << std::endl;
-#endif
-
-	VistaType::sint32 nMessagePayloadSize;
-	int nReturn;
-	nReturn = m_pConnection->ReadInt32( nMessagePayloadSize );
-	assert( nReturn == sizeof( VistaType::sint32 ) );
-#if NET_AUDIO_SHOW_TRAFFIC
-	vstr::out() << "CITANetAudioMessage [ Reading] Answer type " << nReturn << " (id=" << std::setw( 4 ) << m_nMessageId << ") OK" << std::endl;
-#endif
-
-	// We need at least the message type and message id in payload
-	assert( nMessagePayloadSize >= 2 * sizeof( VistaType::sint32 ) );
-
-	if( nMessagePayloadSize > ( int ) m_vecIncomingBuffer.size() )
-		m_vecIncomingBuffer.resize( nMessagePayloadSize );
-
-	// @todo: read over while( received < total ) loop!!!
-
-	int iBytesReceivedTotal = 0;
-	while( nMessagePayloadSize != iBytesReceivedTotal )
-	{
-		int iIncommingBytes = m_pConnection->WaitForIncomingData( 0 );
-		int iBytesReceived = m_pConnection->Receive( &m_vecIncomingBuffer[ iBytesReceivedTotal ], iIncommingBytes );
-		iBytesReceivedTotal += iBytesReceived;
-#if NET_AUDIO_SHOW_TRAFFIC
-		vstr::out() << "[ CITANetAudioMessage ] " << std::setw( 3 ) << std::floor( iBytesReceivedTotal / float( nMessagePayloadSize ) * 100.0f ) << "% of answer transmitted" << std::endl;
-#endif
-	}
-
-	if( iBytesReceivedTotal != nMessagePayloadSize )
-		ITA_EXCEPT1( UNKNOWN, "Protokoll error, Received less bytes than expected when trying to receive answer" );
-
-	// Swap data to deserialization buffer
-	m_oIncoming.SetBuffer( &m_vecIncomingBuffer[ 0 ], nMessagePayloadSize, false );
-
-	// Take out the two protocol variables type and message id from deserialization buffer
-	m_nAnswerType = ReadInt();
-	int nMessageID = ReadInt();
-	assert( nMessageID == m_nMessageId );
+	return true;
 }
 
 int CITANetAudioMessage::GetMessageType() const
@@ -247,21 +179,10 @@ int CITANetAudioMessage::GetMessageType() const
 
 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 )
-{
-	assert( m_nAnswerType == CITANetAudioProtocol::NP_INVALID ); // should only be set once
-	m_nAnswerType = nType;
-}
-
-int CITANetAudioMessage::GetAnswerType() const
-{
-	return m_nAnswerType;
-}
-
 int CITANetAudioMessage::GetIncomingMessageSize() const
 {
 	return m_oIncoming.GetTailSize();
@@ -398,8 +319,9 @@ CITANetAudioProtocol::StreamingParameters CITANetAudioMessage::ReadStreamingPara
 	CITANetAudioProtocol::StreamingParameters oParams;