changeset 41:f3ac00083d5f

owkring version ahead of potential change to aubio pitch calculation
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Wed, 25 Apr 2012 14:21:01 +0100
parents 0d66ecd1f4d3
children 6a7982661703
files src/RecordedMultitrackAudio.cpp src/TempoFollower.h
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/RecordedMultitrackAudio.cpp	Wed Apr 25 00:24:20 2012 +0100
+++ b/src/RecordedMultitrackAudio.cpp	Wed Apr 25 14:21:01 2012 +0100
@@ -16,7 +16,7 @@
 
 	printf("loaded max val  is %f\n", loadedAudioFiles[0].fileLoader.onsetDetect.onsetDetector.maximumDetectionValue);
 	
-	int multitrackToLoad = 16;
+	int multitrackToLoad = 18;
 	setDifferentMultitracks(multitrackToLoad);//command to load this set of audio files - see below
 	
 	//number 7 is problematic with memory
@@ -154,9 +154,13 @@
 			guitarfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsIdiotDance/tractorsSetToRecord2/Bounces/TakeThree/04guitar di_bip.wav";	
 			break;
 			
+		case 18:
+			kickfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDiamondWhite/tractorsDiamondWhite/Bounces/diamondWhiteMultiTakeTwo/01bass di_bip.wav";
+			snarefilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDiamondWhite/tractorsDiamondWhite/Bounces/diamondWhiteMultiTakeTwo/02kick_bip.wav";
+			bassfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDiamondWhite/tractorsDiamondWhite/Bounces/diamondWhiteMultiTakeTwo/03snare bottom_bip.wav";
+			guitarfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDiamondWhite/tractorsDiamondWhite/Bounces/diamondWhiteMultiTakeTwo/04guitar di_bip.wav";
 			
-			
-			
+			break;
 			
 	}
 	if (kickfilename != NULL)
--- a/src/TempoFollower.h	Wed Apr 25 00:24:20 2012 +0100
+++ b/src/TempoFollower.h	Wed Apr 25 14:21:01 2012 +0100
@@ -10,7 +10,7 @@
 #ifndef TEMPO_FOLLOWER_H
 #define TEMPO_FOLLOWER_H
 
-#define NUMBER_OF_CHANNELS 3
+#define NUMBER_OF_CHANNELS 4
 
 #include "ofMain.h"
 #include "DynamicVector.h"