Mercurial > hg > multitrack-audio-matcher
diff src/RecordedMultitrackAudio.cpp @ 31:02f659277346
deletion of sound files included to save memory.
author | Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk> |
---|---|
date | Sun, 01 Apr 2012 01:33:23 +0100 |
parents | 1f2b9e09be17 |
children | 4be22a1a0e24 |
line wrap: on
line diff
--- a/src/RecordedMultitrackAudio.cpp Fri Mar 09 21:24:48 2012 +0000 +++ b/src/RecordedMultitrackAudio.cpp Sun Apr 01 01:33:23 2012 +0100 @@ -16,15 +16,15 @@ printf("loaded max val is %f\n", loadedAudioFiles[0].fileLoader.onsetDetect.onsetDetector.maximumDetectionValue); - + setDifferentMultitracks(7);//command to load this set of audio files - see below - setDifferentMultitracks(5);//command to load this set of audio files - see below + //number 7 is problematic with memory printf("AFTER LOADING: \n"); printInfo(); - numberOfAudioTracks = 3; + numberOfAudioTracks = 4; } @@ -33,6 +33,7 @@ const char *kickfilename ;//= "../../../data/sound/LiveDues/kick_liveDues.wav"; const char *bassfilename ;//"../../../data/sound/LiveDues/bass_upsideLive.wav"; const char *snarefilename ; + const char *guitarfilename ; switch (setToLoad) { case 0: @@ -62,16 +63,44 @@ snarefilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsIdiotDance/tractorsSetToRecord2/Bounces/TakeTwo/snare_bip.wav"; break; case 5: - kickfilename = "/Volumes/Supersaurus/Andrew_tractor_firstBack/tractorsDemo/Bounces/Take14/kick_bip.wav"; - bassfilename = "/Volumes/Supersaurus/Andrew_tractor_firstBack/tractorsDemo/Bounces/Take14/bass_bip.wav"; - snarefilename = "/Volumes/Supersaurus/Andrew_tractor_firstBack/tractorsDemo/Bounces/Take14/snare_bip.wav"; + kickfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take12/02kick_bip.wav"; + bassfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take12/01bass_bip.wav"; + snarefilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take12/03snare_bip.wav"; break; + case 6: + kickfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take13/02kick_bip.wav"; + bassfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take13/01bass_bip.wav"; + snarefilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take13/03snare_bip.wav"; + break; + + case 7: + kickfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take14/02kick_bip.wav"; + bassfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take14/01bass_bip.wav"; + snarefilename ="/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take14/03snare_bip.wav"; + guitarfilename ="/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/Take14/04elec_bip.wav"; + break; + + case 8: + kickfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/DownLine4/02kick_bip.wav"; + bassfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/DownLine4/01bass_bip.wav"; + snarefilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/DownLine4/03snare_bip.wav"; + break; + + case 9: + kickfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/DownLine5/02kick.wav"; + bassfilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/DownLine5/01bass.wav"; + snarefilename = "/Users/andrew/Documents/work/Alignment/MultitrackMatch/tractorsAlign/DownLine5/03snare.wav"; + break; + } loadAudioTrack(kickfilename, 0); loadAudioTrack(bassfilename, 1); loadAudioTrack(snarefilename, 2); + + if (guitarfilename != NULL) + loadAudioTrack(guitarfilename, 3); }