Merged ba_2016_heimes into develop

include/ITANetAudioStreamingServer.h

@@ -80,14 +80,6 @@ private:
 	int m_iClientRingBufferFreeSamples;
 
 	friend class CITANetAudioServer;
-
-	// TODO: in einem Struct speichern
-	struct InitData {
-		int iClientChannels;
-		int iClientRingBufferSize;
-		int iClientBufferSize;
-		double dClientSampleRate;
-	} m_initData;
 };
 
 #endif // INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_SERVER

src/ITANetAudioStreamingServer.cpp

@@ -35,7 +35,6 @@ bool CITANetAudioStreamingServer::Start(const std::string& sAddress, int iPort)
 		m_pSocket = m_pNetAudioServer->GetSocket();
 		// TODO: Init neu mit Netmessage 
 		long nIncomingBytes = m_pSocket->WaitForIncomingData(0);
-		int iBytesReceived = m_pSocket->ReceiveRaw(&m_initData, sizeof( InitData ));
 		m_iClientRingBufferFreeSamples = m_iClientRingBufferFreeSamples;
 
 		int iMessageID = 1;
@@ -84,11 +83,6 @@ int CITANetAudioStreamingServer::GetNetStreamNumberOfChannels() const
 	return m_sfTempTransmitBuffer.channels();
 }
 
-double CITANetAudioStreamingServer::GetNetStreamSampleRate() const
-{
-	return m_initData.dClientSampleRate;
-}
-
 void CITANetAudioStreamingServer::SetAutomaticUpdateRate()
 {
 	m_iUpdateStrategy = AUTO;