Merge branch 'master' of http://git.rwth-aachen.de/ita/ITADataSources

CMakeLists.txt

@@ -31,7 +31,6 @@ set( ITADataSourcesHeader
 	"include/ITADataSource.h"
 	"include/ITADataSourceRealization.h"
 	"include/ITADataSourcesDefinitions.h"
-	"include/ITADataSourceUtils.h"
 	"include/ITAFileDataSink.h"
 	"include/ITAFileDataSource.h"
 	"include/ITAPeakDetector.h"
@@ -43,7 +42,6 @@ set( ITADataSourcesHeader
 	"include/ITAStreamPatchBay.h"
 	"include/ITAStreamProbe.h"
 	"include/ITAStreamProperties.h"
-	"include/ITAStreamPump.h"
 	"include/ITAStreamYJunction.h"
 	)
 
@@ -51,8 +49,7 @@ set( ITADataSourcesSources
 	"src/ITABufferDataSink.cpp"
 	"src/ITABufferDataSource.cpp"
 	"src/ITADataSource.cpp"
-	"src/ITADataSourceRealization.cpp"
-	"src/ITADataSourceUtils.cpp"
+	"src/ITADataSourceRealization.cpp"	
 	"src/ITAFileDataSink.cpp"
 	"src/ITAFileDataSource.cpp"
 	"src/ITAPeakDetector.cpp"
@@ -63,25 +60,32 @@ set( ITADataSourcesSources
 	"src/ITAStreamMultiplier1N.cpp"
 	"src/ITAStreamPatchBay.cpp"
 	"src/ITAStreamProbe.cpp"
-	"src/ITAStreamProperties.cpp"
-	"src/ITAStreamPump.cpp"
+	"src/ITAStreamProperties.cpp"	
 	"src/ITAStreamYJunction.cpp"
 	)
 
+# Filter windows-only components
+if( WIN32 )
+	list( APPEND ITADataSourcesHeader "include/ITAStreamPump.h" "include/ITADataSourceUtils.h" )
+	list( APPEND ITADataSourcesSources "src/ITAStreamPump.cpp" "src/ITADataSourceUtils.cpp" )
+endif( WIN32 )
+
 if( VASIO_FOUND AND ITA_DATA_SOURCE_WITH_INTEGRATED_ASIO )
-	set( ITADataSourcesHeader "${ITADataSourcesHeader}" "include/ITAAsioInterface.h" )
-	set( ITADataSourcesSources "${ITADataSourcesSources}" "src/ITAAsioInterface.cpp" )
+	list( APPEND ITADataSourcesHeader "include/ITAAsioInterface.h" )
+	list( APPEND ITADataSourcesSources "src/ITAAsioInterface.cpp" )
 	add_definitions( -DIEEE754_64FLOAT=1 )
 endif( VASIO_FOUND AND ITA_DATA_SOURCE_WITH_INTEGRATED_ASIO )
 if( VPORTAUDIO_FOUND AND ITA_DATA_SOURCE_WITH_INTEGRATED_PORTAUDIO )
-	set( ITADataSourcesHeader "${ITADataSourcesHeader}" "include/ITAPortaudioInterface.h" )
-	set( ITADataSourcesSources "${ITADataSourcesSources}" "src/ITAPortaudioInterface.cpp" )
+	list( APPEND ITADataSourcesHeader "include/ITAPortaudioInterface.h" )
+	list( APPEND ITADataSourcesSources "src/ITAPortaudioInterface.cpp" )
 endif( VPORTAUDIO_FOUND AND ITA_DATA_SOURCE_WITH_INTEGRATED_PORTAUDIO )
 
 
 # compiler
 if( WIN32 )
 	add_definitions( -DITA_BASE_DLL -DITA_DATA_SOURCES_DLL -DITA_DATA_SOURCES_EXPORT )
+else( WIN32 )
+	add_definitions( -std=c++11 )
 endif( WIN32)
 
 

apps/ita_whad/main.cpp

-//#include <conio.h>
 #include <iostream>
 #include <stdio.h>
 #include <string>
 
+#ifdef ITA_WHAD_WITH_ASIO
 #include <ITAAsioInterface.h>
+#endif
+
+#ifdef ITA_WHAD_WITH_PORTAUDIO
+#include <ITAPortaudioInterface.h>
+#endif
 
 using namespace std;
 

include/ITAFileDataSource.h

@@ -22,7 +22,7 @@
 
 #include <ITADataSourcesDefinitions.h>
           
-#include "ITABufferDatasource.h"
+#include "ITABufferDataSource.h"
               
 #include <string>		// Strings der Standard Template Library (STL)
 #include <vector>
@@ -81,4 +81,4 @@ private:
 	std::vector<float*> vpfData;		// Datenpuffer (Kanalweise)
 };
 
-#endif // INCLUDE_WATCHER_ITA_FILE_DATA_SOURCE
\ No newline at end of file
+#endif // INCLUDE_WATCHER_ITA_FILE_DATA_SOURCE

include/ITAPortaudioInterface.h

@@ -183,9 +183,9 @@ public:
 	/**
 	  * Set up internal variables of ITAPortaudio. No exception will be
 	  * thrown here.
-	  * \note Next do initialization
+	  * @note Next do initialization
 	  *
-	  * \see #Initialize #Initialize(const int iDriver)
+	  * @see Initialize()
 	  */
 	ITAPortaudioInterface( double dSampleRate, int iBufferSize );
 
@@ -203,13 +203,13 @@ public:
 	ITA_PA_ERRORCODE Initialize();
 
 	//! Initialize Portaudio using specified host/driver by id
-	ITA_PA_ERRORCODE Initialize( int iDriverID);
+	ITA_PA_ERRORCODE Initialize( int iDriverID );
 
 	//! Initialize Portaudio using specified driver by name
 	ITA_PA_ERRORCODE Initialize( const std::string& sDriverName );
 
 	//! Use Portaudio with specific input device
-	ITA_PA_ERRORCODE SetOutputDevice( int iOutputDevice);
+	ITA_PA_ERRORCODE SetOutputDevice( int iOutputDevice );
 
 	//! Returns true if playback is enabled, false otherwise
 	bool IsPlaybackEnabled() const;
@@ -277,13 +277,13 @@ public:
 	int GetOutputDevice() const;
 
 	//! Returns the number of input and output channels
-	void GetNumChannels( const int iDeviceID, int& iNumInputChannels, int& iNumOutputChannels ) const;
+	void GetNumChannels( int iDeviceID, int& iNumInputChannels, int& iNumOutputChannels ) const;
 
 	//! Returns the number of input channels
 	/**
 	  * \return Number of input channels (>=0) or #ITA_PA_ERRORCODE (<0)
 	  */
-	int GetNumInputChannels( const int iDeviceID ) const;
+	int GetNumInputChannels( int iDeviceID ) const;
 
 	//! Returns the number of output channels
 	/**

src/ITAStreamPatchBay.cpp

 #include <ITAStreamPatchBay.h>
 
 #include <algorithm>
+#include <float.h>
 #include <iostream>
 
 #include <ITAFastMath.h>

src/ITAStreamProbe.cpp

 #include "ITAStreamProbe.h"
 
 #include <cassert>
-#include <ITABufferedAudiofileWriter.h>
+#include <ITABufferedAudioFileWriter.h>
 
 #ifndef WIN32
 #include <memory.h>

src/ITAStreamYJunction.cpp

 #include "ITAStreamYJunction.h"
 
 #include <ITAException.h>
-#include <ITAStreamPatchbay.h>
+#include <ITAStreamPatchBay.h>
 
 ITAStreamYJunction::ITAStreamYJunction(unsigned int uiOutputs, ITADatasource* pdsInput)
 : m_pImpl(NULL) {

tests/BufferDataSourceTest.cpp

 #include <ITAException.h>
-#include <ITABufferDatasource.h>
-#include <ITADatasourceUtils.h>
+#include <ITABufferDataSource.h>
+#include <ITADataSourceUtils.h>
 #include <stdio.h>
 #include <vector>
 #include <iostream>
@@ -32,7 +32,7 @@ int main(int argc, char* argv[]) {
 		printf("ROI-Length: %d\n", pSource->GetROILength());
 
 		// Kompletten Inhalt in eine Datei schreiben
-		WriteFromDatasourceToFile(pSource, "Complete.wav", pSource->GetCapacity());
+		WriteFromDatasourceToFile( pSource, "Complete.wav", pSource->GetCapacity() );
 
 		// Rckspulen testen
 		pSource->Rewind();
@@ -92,4 +92,4 @@ int main(int argc, char* argv[]) {
 	delete pfInvRamp;
 
 	return 0;
-}
\ No newline at end of file
+}

tests/DatasourceUtilsTest.cpp

 #include <ITAException.h>
-#include <ITAFileDatasource.h>
+#include <ITAFileDataSource.h>
 #include <ITADatasourceUtils.h>
 #include <stdio.h>
 #include <iostream>
@@ -39,4 +39,4 @@ int main(int argc, char* argv[]) {
 	}
 
 	return 0;
-}
\ No newline at end of file
+}

tests/FileDataSourceTest.cpp

 #include <ITAException.h>
-#include <ITAFileDatasource.h>
-#include <ITADatasourceUtils.h>
+#include <ITAFileDataSource.h>
+#include <ITADataSourceUtils.h>
 #include <ITAStreamAmplifier.h>
 #include <stdio.h>
 #include <iostream>
@@ -55,4 +55,4 @@ int main(int argc, char* argv[]) {
 	}
 
 	return 0;
-}
\ No newline at end of file
+}

tests/PeakDetectorTest.cpp

 #include <ITAException.h>
-#include <ITAFileDatasource.h>
+#include <ITAFileDataSource.h>
 #include <ITAPeakDetector.h>
 #include <ITAStringUtils.h>
 #include <iostream>
@@ -49,4 +49,4 @@ int main(int argc, char* argv[]) {
 	}
 
 	return 0;
-}
\ No newline at end of file
+}