Mercurial > hg > multitrack-audio-matcher

changeset 25:9df5449077bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Mon, 13 Feb 2012 17:16:09 +0000
parents 75ebe1982741 (diff) bc113cd60a2f (current diff)
children c47ea39b830d
files src/RecordedMultitrackAudio.cpp
diffstat 1 files changed, 31 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/RecordedMultitrackAudio.cpp	Mon Feb 13 14:58:53 2012 +0000
+++ b/src/RecordedMultitrackAudio.cpp	Mon Feb 13 17:16:09 2012 +0000
@@ -12,8 +12,24 @@
 
 void RecordedMultitrackAudio::loadTestAudio(){
 	
-
+	//some update
+/*	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;
@@ -28,7 +44,9 @@
 /*
 	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;
 */	
@@ -39,12 +57,24 @@
 	printInfo();
 	
 	setDifferentMultitracks(1);
+	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);
 
 	printf("AFTER LOADING 1\n");
 	printInfo();
 	
 	numberOfAudioTracks = 3;
 	
+	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);
 	
 }