Changing stream interface for netaudio

CMakeLists.txt

@@ -32,11 +32,21 @@ if( NOT DEFINED ITA_VANET_SERVER_VERBOSE )
 	mark_as_advanced( ITA_VANET_SERVER_VERBOSE )
 endif( )
 
+if( NOT DEFINED ITA_VANET_NETAUDIO_VERBOSE )
+	set( ITA_VANET_SERVER_VERBOSE false CACHE BOOL "VANet server side with verbose output" )
+	mark_as_advanced( ITA_VANET_SERVER_VERBOSE )
+endif( )
+
 if( NOT DEFINED ITA_VANET_SERVER_SHOW_RAW_TRAFFIC )
 	set( ITA_VANET_SERVER_SHOW_RAW_TRAFFIC false CACHE BOOL "VANet server side print raw network traffic (debugging)" )
 	mark_as_advanced( ITA_VANET_SERVER_SHOW_RAW_TRAFFIC )
 endif( )
 
+if( NOT DEFINED ITA_VANET_WITH_NETAUDIO_STREAM_SERVER_EXTENSION )
+	vista_find_package( ITADataSources QUIET )
+	set( ITA_VANET_WITH_NETAUDIO_STREAM_SERVER_EXTENSION ${ITADATASOURCES_FOUND} CACHE BOOL "VANet with stream server class extension (requires ITADataSources)" )
+endif( )
+
 if( ITA_VANET_CLIENT_VERBOSE )
 	add_definitions( -DVANET_CLIENT_VERBOSE )
 endif( )
@@ -55,12 +65,16 @@ endif( )
 
 vista_use_package( VistaCoreLibs REQUIRED COMPONENTS VistaBase VistaInterProcComm FIND_DEPENDENCIES )
 vista_use_package( VABase REQUIRED )
-vista_find_package( ITADataSources QUIET FIND_DEPENDENCIES )
 
 # Including the source files of all source subfolders recursively
 include( "include/_SourceFiles.cmake" )
 include( "src/_SourceFiles.cmake" )
 
+if( ITA_VANET_WITH_NETAUDIO_STREAM_SERVER_EXTENSION )
+	vista_use_package( ITADataSources REQUIRED FIND_DEPENDENCIES )
+	list( APPEND ProjectSources "src/VANetAudioStreamServer.cpp src/VANetAudioStreamServerImpl.cpp src/VANetAudioStreamServerImpl.h" )
+endif( )
+
 include_directories( "include" )
 
 if( ITA_VISTA_BUILD_STATIC )

include/VANetAudioStreamServer.h

@@ -16,6 +16,7 @@
 
 #include <VANetDefinitions.h>
 
+#include <VABaseDefinitions.h>
 #include <VASamples.h>
 
 class CVANetAudioStreamServerImpl;
@@ -43,7 +44,7 @@ public:
 	bool Initialize( const std::string& sBindAddress, const int iBindPort );
 
 	//! Provide a frame of samples on request (overload this method)
-	virtual void Process( CVASamples& oFrame, CVAStreamInfo ) =0;
+	virtual void Process( CVASampleBuffer& oFrame, const CVAAudiostreamState& ) = 0;
 
 private:
 	CVANetAudioStreamServerImpl* m_pImpl;

src/VANetAudioStreamServer.cpp

+#include <VANetAudioStreamServer.h>
+#include "CVANetAudioStreamServerImpl.h"
+
+CVANetAudioStreamServer::CVANetAudioStreamServer()
+{
+	m_pImpl = new CVANetAudioStreamServerImpl();
+}
+
+CVANetAudioStreamServer::~CVANetAudioStreamServer()
+{
+	delete m_pImpl;
+}
+
+bool CVANetAudioStreamServer::Initialize( const std::string& sBindInterface, const int iBindPort )
+{
+	return m_pImpl->Initialize( sBindInterface, iBindPort );
+}
\ No newline at end of file