diff src/RecordedMultitrackAudio.cpp @ 7:33dedfe32893

kick, snare and bass windowed. Likelihoods in dedicated screen regions

--- a/src/RecordedMultitrackAudio.cpp	Thu Feb 02 17:52:08 2012 +0000
+++ b/src/RecordedMultitrackAudio.cpp	Thu Feb 02 21:55:51 2012 +0000
@@ -13,13 +13,14 @@
 void RecordedMultitrackAudio::loadTestAudio(){
 	
 	
-	const char	*infilename = "../../../data/sound/LiveDues/neuRoom_liveDues.wav";	
+	const char	*infilename = "../../../data/sound/LiveDues/kick_liveDues.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()
@@ -29,7 +30,7 @@
 	//	loadedAudioFiles.push_back(*loadedAudioPtr);
 	loadedAudioFiles[0] = *loadedAudioPtr;
 	
-	loadedAudioFiles[0].fileLoader.onsetDetect.window.setToRelativeSize(0, 0.0, 1, 0.2);
+	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);
@@ -44,14 +45,23 @@
 	loadedAudioPtr->loadAudioFile(infilename);
 	//	loadedAudioFiles.push_back(*loadedAudioPtr);
 	loadedAudioFiles[1] = *loadedAudioPtr;
-	loadedAudioFiles[1].fileLoader.onsetDetect.window.setToRelativeSize(0, 0.2, 1, 0.2);
+	loadedAudioFiles[1].fileLoader.onsetDetect.window.setToRelativeSize(0, trackScreenHeight, 1, trackScreenHeight);
 	loadedAudioFiles[1].setTrackType(1);
-//	loadedAudioFiles[1].fileLoader.onsetDetect.trackType = 0;
+
+	infilename = "../../../data/sound/LiveDues/snare_liveDues.wav";	
+	
+	loadedAudioPtr = new LoadedAudioHolder;
+	loadedAudioPtr->loadAudioFile(infilename);
+	//	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 = 2;
+	numberOfAudioTracks = 3;
 	
 	
 }
@@ -63,8 +73,6 @@
 	for (int i = 0;i < numberOfAudioTracks;i++){		
 		loadedAudioFiles[i].draw();
 	}
-	
-	ofDrawBitmapString("pitch "+ofToString(recentPitch, 2), 20, 20);
 }