Mercurial > hg > multitrack-audio-matcher

comparison src/RecordedMultitrackAudio.cpp @ 35:6fb77b20413c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updating multimatcher for euclidean distance in chroma too
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Sun, 08 Apr 2012 18:59:30 +0100
parents 0d52ba6844b9
children eb43b2a007ea
comparison
equal deleted inserted replaced
34:0d52ba6844b9 35:6fb77b20413c
14 14
15 trackScreenHeight = 0.15; 15 trackScreenHeight = 0.15;
16 16
17 printf("loaded max val is %f\n", loadedAudioFiles[0].fileLoader.onsetDetect.onsetDetector.maximumDetectionValue); 17 printf("loaded max val is %f\n", loadedAudioFiles[0].fileLoader.onsetDetect.onsetDetector.maximumDetectionValue);
18 18
19 setDifferentMultitracks(15);//command to load this set of audio files - see below 19 setDifferentMultitracks(13);//command to load this set of audio files - see below
20 20
21 //number 7 is problematic with memory 21 //number 7 is problematic with memory
22 22
23 printf("AFTER LOADING: \n"); 23 printf("AFTER LOADING: \n");
24 printInfo(); 24 printInfo();
117 117
118 case 13: 118 case 13:
119 kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/02Kick_bip.wav"; 119 kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/02Kick_bip.wav";
120 bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/01Bass.wav"; 120 bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/01Bass.wav";
121 snarefilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/03Snare_bip.wav"; 121 snarefilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/03Snare_bip.wav";
122 guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleArchMultitracks/Take6/04Elec_SM57_bip.wav"; 122 guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/MarbleA4chMultitracks/Take6/04Elec_SM57_bip.wav";
123 break; 123 break;
124 124
125 125
126 case 14: 126 case 14:
127 kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneFull/02Kick_bip.wav"; 127 kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneShorter/02Kick_bip.wav";
128 bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneFull/01Bass.wav"; 128 bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneShorter/01Bass.wav";
129 snarefilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneFull/03Snare_bip.wav"; 129 snarefilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneShorter/03Snare_bip.wav";
130 guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneFull/04Elec_SM57_bip.wav"; 130 guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeOneShorter/04Elec_SM57_bip.wav";
131 break; 131 break;
132 132
133 case 15: 133 case 15:
134 kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoFull/02Kick_bip.wav"; 134 kickfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoShorter/02Kick_bip.wav";
135 bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoFull/01Bass.wav"; 135 bassfilename = "/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoShorter/01Bass.wav";
136 snarefilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoFull/03Snare_bip.wav"; 136 snarefilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoShorter/03Snare_bip.wav";
137 guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoFull/04Elec_SM57_bip.wav"; 137 guitarfilename ="/Volumes/Supersaurus/Gronk/Gronkn/Bounces/StationGateMultitracks/TakeTwoShorter/04Elec_SM57_bip.wav";
138 break; 138 break;
139 139
140 } 140 }
141 loadAudioTrack(kickfilename, 0); 141 loadAudioTrack(kickfilename, 0);
142 loadAudioTrack(bassfilename, 1); 142 loadAudioTrack(bassfilename, 1);