comparison src/RecordedMultitrackAudio.cpp @ 23:bc113cd60a2f

tmp mistake

 #include "RecordedMultitrackAudio.h"
 
 
 void RecordedMultitrackAudio::loadTestAudio(){
 	
+
 	
-/*	const char	*kickfilename = "../../../data/sound/LiveDues/kick_liveDues.wav";	
-	const char	*bassfilename = "../../../data/sound/LiveDues/bass_upsideLive.wav";	
-	const char	*snarefilename = "../../../data/sound/LiveDues/snare_liveDues.wav";	
-*/	
-/*
-	const char	*kickfilename = "../../../data/sound/DiamondMatch1/kick_bip.wav";	
-	const char	*bassfilename = "../../../data/sound/DiamondMatch1/bass_bip.wav";	
-	const char	*snarefilename = "../../../data/sound/DiamondMatch1/snare_bip.wav";	
-*/	
-	const char	*kickfilename = "../../../data/sound/LiveIdiot2/02kick_bip.wav";	
-	const char	*bassfilename = "../../../data/sound/LiveIdiot2/01bass_bip.wav";	
-	const char	*snarefilename = "../../../data/sound/LiveIdiot2/03snare_bip.wav";	
-	
-/*	const char	*kickfilename = "../../../data/sound/UistLive1/02kick_bip.wav";	
-	const char	*bassfilename = "../../../data/sound/UistLive1/01bass_bip.wav";	
-	const char	*snarefilename = "../../../data/sound/UistLive1/03snare_bip.wav";		
-*/	
 	//"../../../data/sound/basicClavScale.wav";	
 	
 	//LoadedAudioHolder lah;
 	//	lah.loadAudioFile(infilename);
 	//	loadedAudioFiles.push_back(lah);

 	trackScreenHeight = 0.15;
 	//Take care here - we need a pointer to create new instance
 	//but not then delete the instance before the vector of all audio tracks has been used
 	//the above code using lah has problem that it deletes objects once out of the scope of testApp.setup()
 	//when lah is in theory no longer used - something like that possible? - at least pointers to onset detection seem deleted
+/*
 	loadedAudioPtr = new LoadedAudioHolder();
 	loadedAudioPtr->loadAudioFile(kickfilename);
-	//	loadedAudioFiles.push_back(*loadedAudioPtr);
 	loadedAudioFiles[0] = *loadedAudioPtr;
-	
 	loadedAudioFiles[0].fileLoader.onsetDetect.window.setToRelativeSize(0, 0.0, 1, trackScreenHeight);
 	loadedAudioFiles[0].setTrackType(0);//	fileLoader.onsetDetect.trackType = 0;
-	
+*/	
 	//	printf("Loaded audio %i\n", (int)numberOfAudioTracks);
 	printf("loaded max val  is %f\n", loadedAudioFiles[0].fileLoader.onsetDetect.onsetDetector.maximumDetectionValue);
 	
 	printf("BEFORE LOADING 1\n");
 	printInfo();
 	
-	loadedAudioPtr = new LoadedAudioHolder;
-	loadedAudioPtr->loadAudioFile(bassfilename);
-	//	loadedAudioFiles.push_back(*loadedAudioPtr);
-	loadedAudioFiles[1] = *loadedAudioPtr;
-	loadedAudioFiles[1].fileLoader.onsetDetect.window.setToRelativeSize(0, trackScreenHeight, 1, trackScreenHeight);
-	loadedAudioFiles[1].setTrackType(1);
+	setDifferentMultitracks(1);
 
-	
-	
-	loadedAudioPtr = new LoadedAudioHolder;
-	loadedAudioPtr->loadAudioFile(snarefilename);
-	//	loadedAudioFiles.push_back(*loadedAudioPtr);
-	loadedAudioFiles[2] = *loadedAudioPtr;
-	loadedAudioFiles[2].fileLoader.onsetDetect.window.setToRelativeSize(0, trackScreenHeight*2, 1, trackScreenHeight);
-	loadedAudioFiles[2].setTrackType(2);
-	
-	
 	printf("AFTER LOADING 1\n");
 	printInfo();
 	
 	numberOfAudioTracks = 3;
 	
 	
+}
+
+void RecordedMultitrackAudio::setDifferentMultitracks(const int& setToLoad){
+	const char	*kickfilename ;//= "../../../data/sound/LiveDues/kick_liveDues.wav";	
+	const char	*bassfilename ;//"../../../data/sound/LiveDues/bass_upsideLive.wav";	
+	const char	*snarefilename ;
+	
+	switch (setToLoad) {
+		case 0:
+			
+				kickfilename = "../../../data/sound/LiveDues/kick_liveDues.wav";	
+				bassfilename = "../../../data/sound/LiveDues/bass_upsideLive.wav";	
+				snarefilename = "../../../data/sound/LiveDues/snare_liveDues.wav";	
+			 
+				
+			
+			break;
+		case 1:
+			
+				kickfilename = "../../../data/sound/DiamondMatch1/kick_bip.wav";	
+				bassfilename = "../../../data/sound/DiamondMatch1/bass_bip.wav";	
+				snarefilename = "../../../data/sound/DiamondMatch1/snare_bip.wav";	
+			
+		
+		case 2:
+				kickfilename = "../../../data/sound/LiveIdiot2/02kick_bip.wav";	
+				bassfilename = "../../../data/sound/LiveIdiot2/01bass_bip.wav";	
+				snarefilename = "../../../data/sound/LiveIdiot2/03snare_bip.wav";	
+			 
+			break;
+		case 3:
+			
+			 	kickfilename = "../../../data/sound/UistLive1/02kick_bip.wav";	
+			 	bassfilename = "../../../data/sound/UistLive1/01bass_bip.wav";	
+			 	snarefilename = "../../../data/sound/UistLive1/03snare_bip.wav";	
+		
+		break;
+	}
+	loadAudioTrack(kickfilename, 0);
+	loadAudioTrack(bassfilename, 1);
+	loadAudioTrack(snarefilename, 2);
+
+
+}
+
+void RecordedMultitrackAudio::loadAudioTrack(std::string name, const int& channel){
+	//kick - track type 0
+	//bass - type 1
+	//snare type 2
+	if (channel >= 0 && channel <= 4){
+	loadedAudioPtr = new LoadedAudioHolder;
+	loadedAudioPtr->loadAudioFile(name);
+	loadedAudioFiles[channel] = *loadedAudioPtr;
+	loadedAudioFiles[channel].fileLoader.onsetDetect.window.setToRelativeSize(0, trackScreenHeight*channel, 1, trackScreenHeight);
+	loadedAudioFiles[channel].setTrackType(channel);
+	}
 }
 
 
 
 void RecordedMultitrackAudio::drawTracks(){