linux compat

include/ITADataSourceDelegator.h

@@ -16,7 +16,7 @@
 #ifndef _ITADATASOURCEDELEGATOR_H_
 #define _ITADATASOURCEDELEGATOR_H_
 
-#include <ITADatasource.h>
+#include <ITADataSource.h>
 
 /**
  * Diese Klasse implementiert die Schnittstelle der ITADatasource, stellt die
@@ -74,4 +74,4 @@ private:
 	ITADatasource* m_pDatasourceDelegatorTarget;
 };
 
-#endif // _ITADATASOURCEDELEGATOR_H_
\ No newline at end of file
+#endif // _ITADATASOURCEDELEGATOR_H_

include/ITAPortaudioInterface.h

@@ -40,7 +40,7 @@ class ITA_DATA_SOURCES_API ITAPortaudioInterface
 {
 public:
 	//! ITAPortaudio error code table
-	typedef enum ITA_PA_ERRORCODE
+	enum ITA_PA_ERRORCODE
 	{
 		//! Portaudio/ITAPortaudio no error
 		ITA_PA_NO_ERROR=0,
@@ -161,7 +161,7 @@ public:
 	};
 
 	//! Portaudio available host APIs
-	typedef enum ITA_PA_HOST_APIS
+	enum ITA_PA_HOST_APIS
 	{
 		ITA_PA_DIRECT_SOUND = 1,	//!< Windows DirectSound
 		ITA_PA_MME = 2,				//!< Windows MME

src/ITAPortaudioInterface.cpp

@@ -8,6 +8,8 @@
 #include <ITADataSourceRealization.h>
 #include <ITAStreamInfo.h>
 
+class PaStreamCallbackTimeInfo;
+
 // Portaudio Callback Function
 static int PortaudioCallbackFunction( const void*, void*, unsigned long, const PaStreamCallbackTimeInfo*, PaStreamCallbackFlags, void* );
 

tests/ITAPortaudioTests/set_path_for_ITAPortaudioInterfaceRecorder.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/ITAPortaudioTests/set_path_for_ITAPortaudioInterfaceTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/ITAPortaudioTests/set_path_for_ITAPortaudioMeasurementTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/NetAudio/CMakeLists.txt

@@ -38,14 +38,16 @@ vista_create_default_info_file( ITANetAudioStreamingServerTest )
 set_property( TARGET ITANetAudioStreamingServerTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources/NetAudio" )
 
 
-add_executable( ITANetAudioStreamingClientTest ITANetAudioStreamingClientTest.cpp )
-target_link_libraries( ITANetAudioStreamingClientTest ${VISTA_USE_PACKAGE_LIBRARIES} )
+if( WIN32 ) # uses ASIO
+	add_executable( ITANetAudioStreamingClientTest ITANetAudioStreamingClientTest.cpp )
+	target_link_libraries( ITANetAudioStreamingClientTest ${VISTA_USE_PACKAGE_LIBRARIES} )
 
-vista_configure_app( ITANetAudioStreamingClientTest )
-vista_install( ITANetAudioStreamingClientTest )
-vista_create_default_info_file( ITANetAudioStreamingClientTest )
+	vista_configure_app( ITANetAudioStreamingClientTest )
+	vista_install( ITANetAudioStreamingClientTest )
+	vista_create_default_info_file( ITANetAudioStreamingClientTest )
 
-set_property( TARGET ITANetAudioStreamingClientTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources/NetAudio" )
+	set_property( TARGET ITANetAudioStreamingClientTest PROPERTY FOLDER "ITACoreLibs/Tests/ITADataSources/NetAudio" )
+endif( )
 
 add_executable( ITANetAudioTest ITANetAudioTest.cpp )
 target_link_libraries( ITANetAudioTest ${VISTA_USE_PACKAGE_LIBRARIES} )

tests/NetAudio/ITANetAudioStreamingClientTest.cpp

@@ -5,11 +5,11 @@
 #include <ITAPortaudioInterface.h>
 #include <ITAStreamMultiplier1N.h>
 #include <ITAException.h>
-#include <ITAFileDatasource.h>
+#include <ITAFileDataSource.h>
 #include <ITAStreamProbe.h>
-#include <ITAStreamPatchbay.h>
+#include <ITAStreamPatchBay.h>
 #include <ITAAsioInterface.h>
-#include <VistaBase\VistaTimeUtils.h>
+#include <VistaBase/VistaTimeUtils.h>
 
 using namespace std;
 

tests/NetAudio/ITANetAudioStreamingServerTest.cpp

@@ -5,7 +5,7 @@
 #include <ITANetAudioServer.h>
 #include <ITAStreamFunctionGenerator.h>
 #include <ITAStreamMultiplier1N.h>
-#include <ITAFileDatasource.h>
+#include <ITAFileDataSource.h>
 
 using namespace std;
 

tests/NetAudio/ITANetAudioTest.cpp

+#include <cmath>
 #include <iostream>
 #include <string>
 
@@ -7,11 +8,10 @@
 #include <ITAPortaudioInterface.h>
 #include <ITAStreamFunctionGenerator.h>
 #include <ITAStreamMultiplier1N.h>
-#include <ITAFileDatasource.h>
 #include <ITAException.h>
-#include <ITAFileDatasource.h>
+#include <ITAFileDataSource.h>
 #include <ITAStreamProbe.h>
-#include <ITAStreamPatchbay.h>
+#include <ITAStreamPatchBay.h>
 
 #include <VistaBase/VistaStreamUtils.h>
 

tests/NetAudio/set_path_for_ITANABufferServerTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/NetAudio/set_path_for_ITANAPlayerTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/NetAudio/set_path_for_ITANetAudioStreamingServerTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/NetAudio/set_path_for_ITANetAudioTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/VistaNetTest/VistaNetTest.cpp

 #include <cassert>
+#include <cmath>
 #include <string>
 
 #include <VistaInterProcComm/Concurrency/VistaThread.h>
@@ -105,7 +106,7 @@ int main( int , char** )
 		vstr::out() << "[ Client ] Client sending data now." << endl;
 		vector< char > vdData( g_lDataSize + 4 );
 		int* piDataSize = ( int* ) &vdData[ 0 ];
-		*piDataSize = unsigned int( g_lDataSize ); // Send data size as first block
+		*piDataSize = (unsigned int)( g_lDataSize ); // Send data size as first block
 		vdData[ 1 * sizeof( int ) + 0 ] = 1; // First entry one (just for fun)
 		vdData[ vdData.size() - 2 ] = -1; // Second last entry -1 (just for fun)
 		void* pData = ( void* ) &vdData[ 0 ];

tests/VistaNetTest/set_path_for_ITAVistaNetClient.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/VistaNetTest/set_path_for_ITAVistaNetServer.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/VistaNetTest/set_path_for_ITAVistaNetTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/set_path_for_BufferDataSourceTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/set_path_for_DatasourceUtilsTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/set_path_for_FileDataSourceTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/set_path_for_PeakDetectorTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/set_path_for_StreamFunctionGeneratorTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/set_path_for_StreamPatchbayTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+

tests/set_path_for_StreamProbeTest.sh

+#!/bin/bash
+# Auto-generated file that sets the environment variables for the project
+
+export LD_LIBRARY_PATH=/home/jst/dev/ITACoreLibs/build/lib:/home/jst/dev/ViSTA/build/lib:/home/jst/dev/ViSTA/build/lib/DriverPlugins:/usr/bin:$LD_LIBRARY_PATH
+export VISTACORELIBS_DRIVER_PLUGIN_DIRS=/home/jst/dev/ViSTA/build/lib/DriverPlugins
+