Mercurial > hg > multitrack-audio-matcher
diff src/RecordedMultitrackAudio.cpp @ 36:eb43b2a007ea
changed newMatchOnset to have different way to calculate onsets vs noise, using the onsetLikelihoodNoise factor
| author | Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk> |
|---|---|
| date | Tue, 24 Apr 2012 01:19:24 +0100 |
| parents | 6fb77b20413c |
| children | 9c803369b229 |
line wrap: on
line diff
--- a/src/RecordedMultitrackAudio.cpp Sun Apr 08 18:59:30 2012 +0100 +++ b/src/RecordedMultitrackAudio.cpp Tue Apr 24 01:19:24 2012 +0100 @@ -16,7 +16,8 @@ printf("loaded max val is %f\n", loadedAudioFiles[0].fileLoader.onsetDetect.onsetDetector.maximumDetectionValue); - setDifferentMultitracks(13);//command to load this set of audio files - see below + int multitrackToLoad = 13; + setDifferentMultitracks(multitrackToLoad);//command to load this set of audio files - see below //number 7 is problematic with memory @@ -119,7 +120,7 @@ kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/02Kick_bip.wav"; bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/01Bass.wav"; snarefilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/03Snare_bip.wav"; - guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleA4chMultitracks/Take6/04Elec_SM57_bip.wav"; + guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/04Elec_SM57_bip.wav"; break; @@ -135,7 +136,20 @@ bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoShorter/01Bass.wav"; snarefilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoShorter/03Snare_bip.wav"; guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoShorter/04Elec_SM57_bip.wav"; - break; + break; + + case 16: + // std::string folder = "/Volumes/Supersaurus/SonOfMan/FollowYourLeaders/FollowYourLeaders/Bounces/FollowMultitracks/Follow_023_D/"; + kickfilename = "/Volumes/Supersaurus/SonOfMan/FollowYourLeaders/FollowYourLeaders/Bounces/FollowMultitracks/Follow_023_D/02Kick_D112_bip.wav"; + bassfilename = "/Volumes/Supersaurus/SonOfMan/FollowYourLeaders/FollowYourLeaders/Bounces/FollowMultitracks/Follow_023_D/01Bass.wav"; + snarefilename = "/Volumes/Supersaurus/SonOfMan/FollowYourLeaders/FollowYourLeaders/Bounces/FollowMultitracks/Follow_023_D//03Snare_Top_bip.wav"; +// guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoShorter/04Elec_SM57_bip.wav"; + break; + + + + + } loadAudioTrack(kickfilename, 0);