Merge branch 'develop' of https://git.rwth-aachen.de/ita/ITASampler into develop

CMakeLists.txt

@@ -53,6 +53,9 @@ else( )
 	add_definitions( -DITA_SAMPLER_STATIC -DITA_CTC_STATIC -DITA_CONVOLUTION_STATIC -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_DATA_SOURCES_STATIC )
 endif( )
 
+if( NOT WIN32 )
+	add_definitions( -std=gnu++11 )
+endif( )
 
 # linker
 add_library( ITASampler ${ITASamplerHeader} ${ITASamplerSources} )

src/ITASoundSampleImpl.cpp

@@ -21,6 +21,7 @@
 #include <ITAException.h>
 #include <ITAFunctors.h>
 
+#include <cstring>
 #include <algorithm>
 
 ITASoundSampleImpl::ITASoundSampleImpl(const std::string& sFilename, int iMaxNumberOfChannels, double dRequiredSamplerate, std::string sName)

src/ITASoundSampleImpl.h

@@ -44,7 +44,7 @@ public:
 	 *
 	 * Hinweis: Die Sample-Daten werden kopiert.
 	 */
-	ITASoundSampleImpl::ITASoundSampleImpl(const float** ppfChannelData, int iNumberOfChannels, int iLength, std::string sName="");
+	ITASoundSampleImpl(const float** ppfChannelData, int iNumberOfChannels, int iLength, std::string sName="");
 
 	~ITASoundSampleImpl();
 

src/ITASoundSamplerImpl.cpp

@@ -31,6 +31,8 @@
 #include <ITANumericUtils.h>
 #include <ITAStringUtils.h>
 
+#include <cstring>
+
 // Vorgabe: Anzahl Samples fr Fading bei Pause/Fortsetzen einer Wiedergabe
 #define DEFAULT_PAUSE_FADE_LENGTH 256
 
@@ -799,4 +801,4 @@ void ITASoundSamplerImpl::RenderOutputBlock() {
 	m_csSlotbuf.leave();
 	m_csTracks.leave();
 
-}
\ No newline at end of file
+}

src/ITASoundSamplerImpl.h

-
 #ifndef INCLUDE_WATCHER_ITA_SOUND_SAMPLER_IMPL
 #define INCLUDE_WATCHER_ITA_SOUND_SAMPLER_IMPL
 
 #include <ITASoundSampler.h>
 
 #include <map>
+#include <string>
 #include <vector>
 
 #include "ITASoundSamplerSlotbuffer.h"
 #include <ITACriticalSection.h>
-#include <ITADatasourceRealization.h>
+#include <ITADataSourceRealization.h>
 
 class ITADatasourceRealization;
 class ITASoundSampleImpl;
@@ -84,7 +84,7 @@ private:
 		std::vector<int> viChannelRoutings;		// Ausgabe Kanle der einzelnen Spurkanle
 		std::vector<double> vdChannelGains;		// Lautstrken der Spurkanle
 
-		inline Track() {}
+		inline Track() {};
 
 		inline Track( int iChannels )
 		{

tests/CMakeLists.txt

@@ -17,16 +17,18 @@ if( ITA_CORE_LIBS_BUILD_STATIC )
 endif( )
 
 
-add_executable( DrumsOnKeyboard DrumsOnKeyboard.cpp )
-target_link_libraries( DrumsOnKeyboard ${VISTA_USE_PACKAGE_LIBRARIES} )
+if( VASIO_FOUND )
+	add_executable( DrumsOnKeyboard DrumsOnKeyboard.cpp )
+	target_link_libraries( DrumsOnKeyboard ${VISTA_USE_PACKAGE_LIBRARIES} )
 
-vista_configure_app( DrumsOnKeyboard )
-vista_install( DrumsOnKeyboard )
-vista_create_default_info_file( DrumsOnKeyboard )
+	vista_configure_app( DrumsOnKeyboard )
+	vista_install( DrumsOnKeyboard )
+	vista_create_default_info_file( DrumsOnKeyboard )
 
-set_property( TARGET DrumsOnKeyboard PROPERTY FOLDER "ITACoreLibs/Tests/ITASampler" )
+	set_property( TARGET DrumsOnKeyboard PROPERTY FOLDER "ITACoreLibs/Tests/ITASampler" )
+endif( )
 
-if( VOPENDAFF_FOUND )
+if( VOPENDAFF_FOUND AND VASIO_FOUND )
 	add_executable( RainyDay RainyDay.cpp )
 	target_link_libraries( RainyDay ${VISTA_USE_PACKAGE_LIBRARIES} )
 

tests/RainyDay.cpp

@@ -2,10 +2,10 @@
 #include <ITAException.h>
 #include <ITASampleClock.h>
 #include <ITANumericUtils.h>
-#include <ITADatasourceUtils.h>
+#include <ITADataSourceUtils.h>
 #include <ITAAsioInterface.h>
 #include <ITASampleFrame.h>
-#include <ITAStopWatch.h>
+#include <ITAStopSatch.h>
 #include <ITAConstants.h>
 
 // ITA sampler

tests/Tests.cpp

@@ -2,7 +2,7 @@
 #include <ITASoundSampler.h>
 #include <ITASampleClock.h>
 #include <ITANumericUtils.h>
-#include <ITADatasourceUtils.h>
+#include <ITADataSourceUtils.h>
 #include <time.h>
 #include <iostream>