Removed old sample server includes

include/ITANetAudioServer.h

@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_SERVER
-#define INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_SERVER
+#ifndef INCLUDE_WATCHER_ITA_NET_AUDIO_SERVER
+#define INCLUDE_WATCHER_ITA_NET_AUDIO_SERVER
 
 #include <ITADataSourcesDefinitions.h>
 
@@ -67,4 +67,4 @@ private:
 	int m_iClientRingBufferFreeSamples;
 	double m_dClientSampleRate;
 };
-#endif // INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_SERVER
+#endif // INCLUDE_WATCHER_ITA_NET_AUDIO_SERVER

include/ITANetAudioStreamingServer.h

@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef INCLUDE_WATCHER_ITA_NET_AUDIO_SAMPLE_SERVER
-#define INCLUDE_WATCHER_ITA_NET_AUDIO_SAMPLE_SERVER
+#ifndef INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_SERVER
+#define INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_SERVER
 
 #include <ITADataSourcesDefinitions.h>
 
@@ -78,4 +78,4 @@ private:
 	friend class CITANetAudioServer;
 };
 
-#endif // INCLUDE_WATCHER_ITA_NET_AUDIO_SAMPLE_SERVER
+#endif // INCLUDE_WATCHER_ITA_NET_AUDIO_STREAMING_SERVER

tests/NetAudio/ITANetAudioClientTest.cpp

@@ -30,7 +30,8 @@ int main( int , char** )
 	cout << "Will now connect to '" << g_sServerName << "' on port " << g_iServerPort << endl;
 	try
 	{
-		oNetAudioStream.Connect( g_sServerName, g_iServerPort );
+		if( !oNetAudioStream.Connect( g_sServerName, g_iServerPort ) )
+			ITA_EXCEPT1( INVALID_PARAMETER, "Could not connect to server" );
 	}
 	catch( ITAException e )
 	{

tests/NetAudio/ITANetAudioSampleServerTest.cpp

 #include <iostream>
 #include <string>
 
-#include <ITANetAudioSampleServer.h>
+#include <ITANetAudioStreamingServer.h>
+#include <ITANetAudioServer.h>
 #include <ITAStreamFunctionGenerator.h>
 
 using namespace std;
@@ -15,11 +16,12 @@ int main( int , char** )
 {
 	ITAStreamFunctionGenerator oGenerator( 1, g_dSampleRate, g_iBlockLength, ITAStreamFunctionGenerator::SINE, 456.78f, 0.81f, true );
 
-	CITANetAudioSampleServer oSampleServer;
-	oSampleServer.SetInputStream( &oGenerator );
+	CITANetAudioStreamingServer oStreamingServer;
+	oStreamingServer.SetInputStream( &oGenerator );
 
+	CITANetAudioServer oServer( &oStreamingServer );
 	cout << "Starting server and waiting for connections on '" << g_sServerName << "' on port " << g_iServerPort << endl;
-	oSampleServer.Start( g_sServerName, g_iServerPort );
+	oServer.Start( g_sServerName, g_iServerPort );
 
 	int iKey;
 	cin >> iKey;