merge fixed bodyloop

include/ITANetAudioMessage.h

@@ -78,7 +78,10 @@ public:
 	void WriteString( const std::string& );
 	void WriteIntVector( const std::vector< int > );
 	void WriteFloatVector( const std::vector< float > );
-	void WriteStreamingParameters( const CITANetAudioProtocol::StreamingParameters &);
+	void WriteStreamingParameters(const CITANetAudioProtocol::StreamingParameters &); 
+	void WriteRingBufferSize(const int);
+	void WriteRingBufferFree(const int);
+	void WriteSampleFrame(ITASampleFrame*);
 
 	std::string ReadString();
 	int ReadInt();
@@ -89,6 +92,9 @@ public:
 	std::vector< int > ReadIntVector();
 	std::vector< float > ReadFloatVector();
 	CITANetAudioProtocol::StreamingParameters ReadStreamingParameters();
+	int ReadRingBufferSize();
+	int ReadRingBufferFree();
+	void ReadSampleFrame(ITASampleFrame* pSampleFrame);
 
 
 private:

include/ITANetAudioStreamingServer.h

@@ -74,8 +74,6 @@ public:
 
 	void SetAutomaticUpdateRate();
 
-	bool LoopBody();
-
 protected:
 	int Transmit( const ITASampleFrame& sfNewSamples, int iNumSamples );
 	ITADatasource* GetInputStream() const;

src/ITANetAudioMessage.cpp

@@ -102,7 +102,7 @@ void CITANetAudioMessage::ReadMessage()
 		int nReturn = m_pConnection->ReadInt32( nMessageSize );
 		
 		// we need at least the two protocol ints
-		assert( nMessageSize >= 3 * sizeof( VistaType::sint32 ) );
+		assert( nMessageSize >= 2 * sizeof( VistaType::sint32 ) );
 
 		if( nMessageSize > ( int ) m_vecIncomingBuffer.size() )
 			m_vecIncomingBuffer.resize( nMessageSize );
@@ -397,3 +397,53 @@ void CITANetAudioMessage::WriteStreamingParameters( const CITANetAudioProtocol::
 	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

@@ -24,7 +24,6 @@ CITANetAudioServer::CITANetAudioServer()
 	, m_pSocket( NULL )
 	, m_pConnection( NULL )
 	, m_iServerPort( -1 )
-	, m_pConnection( NULL )
 {
 };
 

src/ITANetAudioStreamingClient.cpp

@@ -13,9 +13,9 @@ CITANetAudioStreamingClient::CITANetAudioStreamingClient( CITANetAudioStream* pP
 {
 	m_pClient = new CITANetAudioClient();
 
-	m_oClientParams.iChannels = pParent->GetNumberOfChannels();
-	m_oClientParams.dSampleRate = pParent->GetSampleRate();
-	m_oClientParams.iBlockSize = pParent->GetBlocklength();
+	m_oParams.iChannels = pParent->GetNumberOfChannels();
+	m_oParams.dSampleRate = pParent->GetSampleRate();
+	m_oParams.iBlockSize = pParent->GetBlocklength();
 
 	m_pMessage = new CITANetAudioMessage( VistaSerializingToolset::SWAPS_MULTIBYTE_VALUES );
 }
@@ -24,6 +24,8 @@ CITANetAudioStreamingClient::~CITANetAudioStreamingClient()
 {
 	if( m_pConnection )
 	{
+		m_pMessage->ResetMessage();
+		m_pMessage->SetConnection( m_pConnection );
 		m_pMessage->SetMessageType( CITANetAudioProtocol::NP_CLIENT_CLOSE );
 		m_pMessage->WriteAnswer();
 	}
@@ -79,9 +81,17 @@ bool CITANetAudioStreamingClient::LoopBody()
 	if( m_bStopIndicated )
 		return true;
 
-	// Receive message
-	m_pMessage->ReadMessage();
-	switch( m_pMessage->GetMessageType() )
+	// send freesamples
+	m_pMessage->ResetMessage();
+	m_pMessage->SetConnection(m_pConnection);
+	m_pMessage->SetMessageType(CITANetAudioProtocol::NP_CLIENT_WAITING_FOR_SAMPLES);
+	m_pMessage->WriteInt( m_pStream->GetRingbufferFreeSamples() );
+	m_pMessage->WriteMessage();
+	m_pMessage->ReadAnswer();
+
+
+
+	switch( m_pMessage->GetAnswerType() )
 	{
 	case CITANetAudioProtocol::NP_INVALID:
 		break;

src/ITANetAudioStreamingServer.cpp

@@ -70,10 +70,6 @@ int CITANetAudioStreamingServer::GetNetworkPort() const
 {
 	return m_pNetAudioServer->GetNetworkPort();
 }
-bool CITANetAudioStreamingServer::LoopBody()
-{
-	return true;
-}
 
 void CITANetAudioStreamingServer::Stop() 
 {
@@ -118,16 +114,26 @@ bool CITANetAudioStreamingServer::LoopBody()
 	case CITANetAudioProtocol::NP_CLIENT_WAITING_FOR_SAMPLES:
 		if( m_pInputStream )
 		{
+			int iFreeSamples = m_pMessage->ReadInt();
+			if (iFreeSamples < m_pInputStream->GetBlocklength()) {
+				// zurückmelden und warten auf exeption
+				break;
+			}
+
 			for( int i = 0; i < m_pInputStream->GetNumberOfChannels(); i++ )
 			{
 				ITAStreamInfo oStreamInfo;
 				const float* pfData = m_pInputStream->GetBlockPointer( i, &oStreamInfo );
 				m_sfTempTransmitBuffer[ i ].write( pfData, m_pInputStream->GetBlocklength() );
 			}
+			m_pMessage->WriteSampleFrame( &m_sfTempTransmitBuffer );
 		}
 
-		//m_pMessage->WriteSampleFrame( &m_sfTempTransmitBuffer );
 		m_pMessage->WriteAnswer();
+
+		m_pInputStream->IncrementBlockPointer();
+		float fTimeOut = m_pInputStream->GetBlocklength() / m_pInputStream->GetSampleRate();
+		//VistaTimeUtils::Sleep( (int) ( fTimeOut * 1000 ) );
 		break;
 	}
 

tests/NetAudio/ITANetAudioStreamingServerTest.cpp

@@ -16,8 +16,8 @@ int main( int , char** )
 {
 	ITAStreamFunctionGenerator oGenerator( 1, g_dSampleRate, g_iBlockLength, ITAStreamFunctionGenerator::SINE, 456.78f, 0.81f, true );
 
-	//CITANetAudioStream oStreamingServer;
-	//oStreamingServer.SetInputStream( &oGenerator );
+	CITANetAudioStreamingServer oStreamingServer;
+	oStreamingServer.SetInputStream( &oGenerator );
 
 	cout << "Starting server and waiting for connections on '" << g_sServerName << "' on port " << g_iServerPort << endl;
 	oStreamingServer.Start( g_sServerName, g_iServerPort );