merge

.gitignore

@@ -3,7 +3,13 @@ CMakeCache.txt
 CMakeFiles
 
 *.suo
+<<<<<<< HEAD
 
 *.bat
 *.exe
-*.wav
\ No newline at end of file
+*.wav
+=======
+CMakeFiles
+*.bat
+*.exe
+>>>>>>> develop

include/ITANetAudioClient.h

@@ -39,7 +39,7 @@ class CITANetAudioClient : public VistaThreadLoop
 {
 public:
 
-	//! Create an network audio client tha feeds into a network audio stream
+	//! Create an network audio client that feeds into a network audio stream
 	/**
 	  * \param pParent ITADataSource-compatible audio stream
 	  */

include/ITANetAudioServer.h

@@ -37,7 +37,7 @@ class VistaTCPServer;
   * Can be connected to an ITADataSource as a streaming source
   * or to a user-implemented sample producer, i.e. an audio sythesizer.
   */
-class CITANetAudioServer : public VistaThreadLoop
+class ITA_DATA_SOURCES_API CITANetAudioServer : public VistaThreadLoop
 {
 public:
 	CITANetAudioServer( CITANetAudioStreamingServer* pParent );

include/ITANetAudioStreamingClient.h

+/*
+ * ----------------------------------------------------------------
+ *
+ *		ITA core libs
+ *		(c) Copyright Institute of Technical Acoustics (ITA)
+ *		RWTH Aachen University, Germany, 2015-2016
+ *
+ * ----------------------------------------------------------------
+ *				    ____  __________  _______
+ *				   //  / //__   ___/ //  _   |
+ *				  //  /    //  /    //  /_|  |
+ *				 //  /    //  /    //  ___   |
+ *				//__/    //__/    //__/   |__|
+ *
+ * ----------------------------------------------------------------
+ *
+ */
+
+#ifndef INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_CLIENT
+#define INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_CLIENT
+
+#include <ITADataSourcesDefinitions.h>
+
+#include <ITADataSource.h>
+#include <ITASampleFrame.h>
+
+#include <string>
+#include <vector>
+
+class CITANetAudioClient;
+
+//! Network audio streaming client
+/**
+ * Audio streaming for a signal source that is connected via TCP/IP.
+ *
+ * \note not thread-safe
+ */
+class ITA_DATA_SOURCES_API CITANetAudioStreamingClient : public VistaThreadLoop
+{
+public:
+	CITANetAudioStreamingClient( int iChannels, double dSamplingRate, int iBufferSize, int iRingBufferCapacity );
+	virtual ~CITANetAudioStreamingClient();
+
+	bool Connect( const std::string& sAddress, int iPort );
+	bool GetIsConnected() const;
+
+	bool LoopBody();
+
+private:
+	CITANetAudioClient* m_pClient;
+	CITANetAudioStream* m_pStream;
+
+	ITASampleFrame m_sfReceivingBuffer; //!< Buffer incoming data
+
+	friend class CITANetAudioClient;
+};
+
+#endif // INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_CLIENT