# HG changeset patch # User Andrew N Robertson # Date 1335360061 -3600 # Node ID f3ac00083d5f3c3b46f123899dace42cdd487f29 # Parent 0d66ecd1f4d3531f04d60d41d4ae7ce7691e6c34 owkring version ahead of potential change to aubio pitch calculation diff -r 0d66ecd1f4d3 -r f3ac00083d5f src/RecordedMultitrackAudio.cpp --- 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) diff -r 0d66ecd1f4d3 -r f3ac00083d5f src/TempoFollower.h --- 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"