Fixing bugs in static/dynamic library configuration

src/ITASoundSamplerImpl.h

@@ -15,7 +15,8 @@ class ITADatasourceRealization;
 class ITASoundSampleImpl;
 class ITASoundSamplePoolImpl;
 
-class ITASoundSamplerImpl : public ITASoundSampler, private ITADatasourceRealization {
+class ITASoundSamplerImpl : public ITASoundSampler, private ITADatasourceRealization
+{
 public:
 	ITASoundSamplerImpl(int iOutputChannels, double dSamplerate, int iBlocklength, ITASoundSamplePool* pSamplepool=NULL);
 	~ITASoundSamplerImpl();
@@ -74,7 +75,8 @@ public:
 
 private:
 	// Interne Datenklasse die Spuren beschreibt
-	class Track {
+	class Track
+	{
 	public:
 		std::string sName;
 		int iChannels;							// Anzahl Kanle
@@ -82,9 +84,10 @@ private:
 		std::vector<int> viChannelRoutings;		// Ausgabe Kanle der einzelnen Spurkanle
 		std::vector<double> vdChannelGains;		// Lautstrken der Spurkanle
 
-		Track() {}
+		inline Track() {}
 
-		Track(int iChannels) {
+		inline Track( int iChannels )
+		{
 			/*
 			 *  Standardlautstrke fr die Spur und alle ihre Kanle = 0 dB.
 			 *  Standardmig werden die Kanle der Spur linear auf die Ausgangskanle abgebildet

tests/CMakeLists.txt

@@ -16,7 +16,7 @@ vista_use_package( OpenDAFF QUIET )
 
 add_definitions( -DIEEE754_64FLOAT=1 )
 if( ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC )
-	add_definitions( -DITA_BASE_STATIC -DITA_SAMPLER_STATIC )
+	add_definitions( -DITA_BASE_STATIC -DITA_SAMPLER_STATIC -DITA_DATA_SOURCES_STATIC )
 endif( ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC  )
 
 

tests/Tests.cpp

@@ -127,7 +127,7 @@ int main(int argc, char* argv[]) {
 						sampler->AddPlaybackBySamplecount( SAMPLE_TOM1 + irandx( 3 ), TRACK_TOMS, int( t + ( j + p )*u), false, randgain() );
 
 					if (randmatch(0.75))
-						sampler->AddPlaybackBySamplecount( SAMPLE_CRASH, TRACK_CRASH, int( t + ( j + p + 1 )*u), false, randgain() );
+						sampler->AddPlaybackBySamplecount( SAMPLE_CRASH, TRACK_CRASH, int( t + ( j + p + 1 )*u ), false, randgain() );
 				}
 			}