Mercurial > hg > multitrack-audio-matcher
diff src/RecordedMultitrackAudio.cpp @ 43:b7ad807c9cde
Added annotation writing and the src for the result calculator
| author | Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 04 May 2012 15:33:36 +0100 |
| parents | 6a7982661703 |
| children | 689704aa55d5 |
line wrap: on
line diff
--- a/src/RecordedMultitrackAudio.cpp Wed Apr 25 23:25:10 2012 +0100 +++ b/src/RecordedMultitrackAudio.cpp Fri May 04 15:33:36 2012 +0100 @@ -16,7 +16,7 @@ printf("loaded max val is %f\n", loadedAudioFiles[0].fileLoader.onsetDetect.onsetDetector.maximumDetectionValue); - int multitrackToLoad = 18; + int multitrackToLoad = 13; setDifferentMultitracks(multitrackToLoad);//command to load this set of audio files - see below //number 7 is problematic with memory @@ -41,8 +41,10 @@ kickfilename = "../../../data/sound/LiveDues/kick_liveDues.wav"; bassfilename = "../../../data/sound/LiveDues/bass_upsideLive.wav"; snarefilename = "../../../data/sound/LiveDues/snare_liveDues.wav"; + guitarfilename = "../../../data/sound/LiveDues/elec_upsideLive.wav"; break; case 1: + //USE THE 18 AT BOTTOM kickfilename = "../../../data/sound/DiamondMatch1/kick_bip.wav"; bassfilename = "../../../data/sound/DiamondMatch1/bass_bip.wav"; snarefilename = "../../../data/sound/DiamondMatch1/snare_bip.wav"; @@ -161,6 +163,35 @@ guitarfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDiamondWhite/tractorsDiamondWhite/Bounces/diamondWhiteMultiTakeTwo/04guitar di_bip.wav"; break; + case 19: + bassfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/LewesMultitracks/LewesStudioTake13/bass di_bip.wav"; + kickfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/LewesMultitracks/LewesStudioTake13/kick_bip.wav"; + snarefilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/LewesMultitracks/LewesStudioTake13/snare_bip.wav"; + guitarfilename = "/Volumes/Supersaurus/TractorsAlbum/tractorsDemo/Bounces/LewesMultitracks/LewesStudioTake13/guitar di_bip.wav"; + break; + + case 20: + bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/WanderlustMulitracks/Wanderlust_Take16/Bass D.I.wav"; + kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/WanderlustMulitracks/Wanderlust_Take16/Kick_bip.wav"; + snarefilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/WanderlustMulitracks/Wanderlust_Take16/Snare_bip.wav"; + guitarfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/WanderlustMulitracks/Wanderlust_Take16/Elec SM57_bip.wav"; + break; + + + case 21: + bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/Windowsill_Multitracks/Windowsill_Take12/Bass D.I.wav"; + kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/Windowsill_Multitracks/Windowsill_Take12/Kick_bip.wav"; + snarefilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/Windowsill_Multitracks/Windowsill_Take12/Snare_bip.wav"; + guitarfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/Windowsill_Multitracks/Windowsill_Take12/Elec SM57_bip.wav"; + break; + + case 22: + bassfilename = "/Users/andrew/Music/Logic/SonOfMan/SonOfManMultitracks/SonOfMan_TakeThree/Bass_bip.wav"; + kickfilename = "/Users/andrew/Music/Logic/SonOfMan/SonOfManMultitracks/SonOfMan_TakeThree/Kik RE20_bip.wav"; + snarefilename = "/Users/andrew/Music/Logic/SonOfMan/SonOfManMultitracks/SonOfMan_TakeThree/Snare Top_bip.wav"; + guitarfilename = "/Users/andrew/Music/Logic/SonOfMan/SonOfManMultitracks/SonOfMan_TakeThree/Electric di_bip.wav"; + break; + }