andrew@33
|
1 /*
|
andrew@33
|
2 * midiEventHolder.cpp
|
andrew@33
|
3 * midiCannamReader3
|
andrew@33
|
4 *
|
andrew@33
|
5 * Created by Andrew on 19/07/2011.
|
andrew@33
|
6 * Copyright 2011 QMUL. All rights reserved.
|
andrew@33
|
7 *
|
andrew@33
|
8 */
|
andrew@33
|
9
|
andrew@33
|
10
|
andrew@33
|
11 //Main file to look at here is newNoteEvent() - this calls everything else to update the Bayesian array
|
andrew@33
|
12
|
andrew@46
|
13 //Relative speed is RECORDED / PLAYED
|
andrew@46
|
14 //so for timedifference t
|
andrew@46
|
15 //this is t/scalar in terms of position units of played time
|
andrew@46
|
16 //and by relative speed r, r*t/scalar
|
andrew@46
|
17
|
andrew@46
|
18
|
andrew@33
|
19 #include "midiEventHolder.h"
|
andrew@36
|
20
|
andrew@37
|
21 #include <iostream>
|
andrew@37
|
22 #include <fstream>
|
andrew@42
|
23 #include <assert.h>
|
andrew@33
|
24
|
andrew@33
|
25 midiEventHolder::midiEventHolder(){
|
andrew@36
|
26
|
andrew@38
|
27
|
andrew@47
|
28 double scalarForPositionVectors = 10;
|
andrew@36
|
29
|
andrew@33
|
30 // recordedNoteOnIndex = 0;
|
andrew@34
|
31 alignmentPosition = 0;
|
andrew@33
|
32
|
andrew@33
|
33 useTempoPrior = false;//puts sine wave round tempo
|
andrew@33
|
34 confidenceWeightingUsed = true;
|
andrew@33
|
35 newOptimalMethod = true;
|
andrew@33
|
36
|
andrew@34
|
37 matchWindowWidth = 16000;//window size for matching in ms
|
andrew@33
|
38 interNoteRange = 1600;//preferred duration
|
andrew@33
|
39 //so max here is really four
|
andrew@33
|
40
|
andrew@33
|
41
|
andrew@33
|
42 likelihoodWidth = 100;//using 100 is good
|
andrew@33
|
43 likelihoodToNoiseRatio = 0.20;//was 0.02 on 18/11/11, changing to give more weight to observations
|
andrew@33
|
44 //was 0.08 on 11/12/11 but need more for tempo varn in rwc database
|
andrew@33
|
45
|
andrew@33
|
46 bayesStruct.speedLikelihoodNoise = 0.1;//was 0.05
|
andrew@33
|
47 bayesStruct.speedDecayWidth = 40;
|
andrew@33
|
48 bayesStruct.speedDecayAmount = 10;
|
andrew@33
|
49
|
andrew@40
|
50 drawTempoMode = false;
|
andrew@33
|
51 //there is option to use MAP estinate or integral in beayesianarraystricture class
|
andrew@33
|
52
|
andrew@33
|
53 runningInRealTime = true;
|
andrew@33
|
54 bayesStruct.realTimeMode = &runningInRealTime;
|
andrew@33
|
55
|
andrew@33
|
56 minimumMatchSpeed = 0.0;
|
andrew@33
|
57 maximumMatchSpeed = 2.0;
|
andrew@33
|
58 minimumTimeIntervalForTempoUpdate = 150;
|
andrew@33
|
59
|
andrew@33
|
60 width = ofGetWidth();
|
andrew@33
|
61 height = ofGetHeight();
|
andrew@33
|
62 screenWidth= &width;
|
andrew@33
|
63 screenHeight = &height;
|
andrew@33
|
64
|
andrew@33
|
65 ticksPerScreen = 4000;
|
andrew@33
|
66 tickLocation = 0;
|
andrew@33
|
67 pulsesPerQuarternote = 240;
|
andrew@33
|
68 noteArrayIndex = 0;
|
andrew@33
|
69 noteMinimum = 30;
|
andrew@33
|
70 noteMaximum = 96;
|
andrew@33
|
71
|
andrew@33
|
72
|
andrew@33
|
73
|
andrew@33
|
74
|
andrew@33
|
75
|
andrew@33
|
76 speedPriorValue = 1.0;
|
andrew@33
|
77
|
andrew@46
|
78 int tmpArraySize = (int)(matchWindowWidth/scalarForPositionVectors);
|
andrew@46
|
79 bayesStruct.resetSize(tmpArraySize);
|
andrew@46
|
80 bayesStruct.setPositionDistributionScalar(scalarForPositionVectors);
|
andrew@46
|
81 printf("ARRAY SIZE IS %i\n", tmpArraySize);
|
andrew@33
|
82
|
andrew@33
|
83 bayesStruct.resetSpeedSize(200);
|
andrew@33
|
84 bayesStruct.setRelativeSpeedScalar(0.01);
|
andrew@33
|
85 bayesStruct.relativeSpeedPrior.getMaximum();
|
andrew@33
|
86 //bayesStruct.simpleExample();
|
andrew@33
|
87
|
andrew@33
|
88
|
andrew@33
|
89 speedWindowWidthMillis = 1600;//4000
|
andrew@34
|
90
|
andrew@33
|
91 noteHeight = (*screenHeight) / (float)(noteMaximum - noteMinimum);
|
andrew@33
|
92
|
andrew@33
|
93
|
andrew@33
|
94 intervalsToCheck.push_back(1);
|
andrew@33
|
95 intervalsToCheck.push_back(2);
|
andrew@33
|
96 //intervalsToCheck.push_back(3);
|
andrew@33
|
97 intervalsToCheck.push_back(4);
|
andrew@33
|
98 intervalsToCheck.push_back(6);
|
andrew@33
|
99 intervalsToCheck.push_back(8);
|
andrew@33
|
100 intervalsToCheck.push_back(16);
|
andrew@33
|
101
|
andrew@33
|
102
|
andrew@33
|
103 drawPhaseMode = true;
|
andrew@33
|
104
|
andrew@33
|
105 printf("lookup index %f value %f\n", bayesStruct.prior.getLookupIndex(100, 30., 10.0), bayesStruct.prior.gaussianLookupTable[(int)bayesStruct.prior.getLookupIndex(100, 30., 10.0)]);
|
andrew@33
|
106 }
|
andrew@33
|
107
|
andrew@33
|
108
|
andrew@33
|
109
|
andrew@33
|
110 void midiEventHolder::reset(){
|
andrew@33
|
111 //called when we start playing
|
andrew@33
|
112
|
andrew@33
|
113 noteArrayIndex = 0;
|
andrew@33
|
114 tickLocation = 0;
|
andrew@34
|
115 startPlayingTime = getTimeNow(0);//ofGetElapsedTimeMillis();
|
andrew@33
|
116 bayesStruct.lastEventTime = getTimeNow(0);//ofGetElapsedTimeMillis();
|
andrew@33
|
117 numberOfScreensIn = 0;
|
andrew@33
|
118 // recordedNoteOnIndex = 0;
|
andrew@33
|
119 bayesStruct.setNewDistributionOffsets(0);
|
andrew@33
|
120 bayesStruct.posterior.offset = 0;
|
andrew@33
|
121
|
andrew@33
|
122 playedEventTimes.clear();
|
andrew@33
|
123 playedNoteOnMatrix.clear();
|
andrew@33
|
124 matchMatrix.clear();
|
andrew@33
|
125 bestMatchIndex = 0;
|
andrew@33
|
126
|
andrew@33
|
127 recordedTotalNoteCounterByPitch.clear();
|
andrew@33
|
128 recordedTotalNoteCounterByPitch.assign(127,0);
|
andrew@33
|
129 totalNoteCounterIndex = 0;
|
andrew@34
|
130
|
andrew@33
|
131 interNoteIntervals.clear();
|
andrew@33
|
132
|
andrew@35
|
133 smoothIndex = 0;
|
andrew@34
|
134 smoothPlayPosition = 0.0;
|
andrew@34
|
135 // relativeSpeedForSmooth = 1.0;
|
andrew@34
|
136 // storedSmoothPlayPosition = smoothPlayPosition;
|
andrew@34
|
137 // lastSmoothUpdateTime = getTimeNow(0);
|
andrew@34
|
138
|
andrew@34
|
139 printf("reset speed prior is %f\n", speedPriorValue);
|
andrew@46
|
140 // bayesStruct.resetSpeedToOne();
|
andrew@33
|
141 bayesStruct.setSpeedPrior(speedPriorValue);
|
andrew@33
|
142 setMatchedNotesBackToFalse();
|
andrew@34
|
143
|
andrew@46
|
144 // periodCounter = 0;
|
andrew@46
|
145 // for (int i = 0;i < periodValues.size();i++){
|
andrew@34
|
146 // printf("period at %f is %f\n", periodValues[i][2], periodValues[i][1]);
|
andrew@46
|
147 // }
|
andrew@34
|
148 /* if (periodValues.size() > 0){
|
andrew@34
|
149 updatePeriodValue(0);// periodValues[0][2];
|
andrew@34
|
150 printf("Resetting period to %f , size is %i\n", period, (int)periodValues.size());
|
andrew@34
|
151 }
|
andrew@34
|
152 */
|
andrew@34
|
153 //period = 500.0;
|
andrew@33
|
154 }
|
andrew@33
|
155
|
andrew@33
|
156 void midiEventHolder::setMatchedNotesBackToFalse(){
|
andrew@33
|
157 for (int i = 0;i < noteOnMatches.size();i++)
|
andrew@33
|
158 noteOnMatches[i] = false;
|
andrew@33
|
159 }
|
andrew@33
|
160
|
andrew@33
|
161 void midiEventHolder::clearAllEvents(){
|
andrew@33
|
162 recordedNoteOnMatrix.clear();
|
andrew@33
|
163 matchesFound.clear();
|
andrew@33
|
164 noteOnMatches.clear();
|
andrew@33
|
165 recordedEventTimes.clear();
|
andrew@33
|
166 measureVector.clear();
|
andrew@33
|
167 //played events:
|
andrew@33
|
168 playedEventTimes.clear();
|
andrew@33
|
169 playedNoteOnMatrix.clear();
|
andrew@33
|
170 matchMatrix.clear();
|
andrew@33
|
171 bestMatchFound.clear();
|
andrew@33
|
172 periodValues.clear();
|
andrew@33
|
173
|
andrew@35
|
174 beatPositions.clear();
|
andrew@35
|
175
|
andrew@33
|
176 recordedTotalNoteCounterByPitch.clear();
|
andrew@33
|
177 recordedTotalNoteCounterByPitch.assign(127, 0);
|
andrew@33
|
178 totalNoteCounterIndex = 0;
|
andrew@33
|
179 }
|
andrew@33
|
180
|
andrew@33
|
181 void midiEventHolder::printNotes(){
|
andrew@33
|
182 printf("RECORDED MATRIX\n");
|
andrew@33
|
183 for (int i = 0;i < recordedNoteOnMatrix.size();i++){
|
andrew@33
|
184 printf("ticktime %i :: pitch %i @ millis %f\n", recordedNoteOnMatrix[i][0], recordedNoteOnMatrix[i][1], recordedEventTimes[i]);
|
andrew@33
|
185 }
|
andrew@33
|
186 }
|
andrew@33
|
187
|
andrew@33
|
188
|
andrew@33
|
189 double midiEventHolder::getEventTimeTicks(double millis){
|
andrew@34
|
190 return 0.0;
|
andrew@34
|
191 //return (millis * pulsesPerQuarternote / period);
|
andrew@33
|
192 }
|
andrew@33
|
193
|
andrew@33
|
194 double midiEventHolder::getEventTimeMillis(double ticks){
|
andrew@33
|
195 return (period * ticks / (double) pulsesPerQuarternote);
|
andrew@33
|
196 }
|
andrew@33
|
197
|
andrew@33
|
198 void midiEventHolder::newNoteOnEvent(int pitch, int velocity, double timePlayed){
|
andrew@33
|
199 // tempoSpeedString = "";
|
andrew@46
|
200
|
andrew@33
|
201 //MOVE INTO BAYESSTRUCT?? XXX
|
andrew@33
|
202 //bayesStruct.copyPriorToPosterior();
|
andrew@33
|
203 //why was this here??
|
andrew@33
|
204 bayesStruct.prior.copyFromDynamicVector(bayesStruct.posterior);//try the otehr way
|
andrew@33
|
205 //bayesStruct.copyPriorToPosterior();
|
andrew@33
|
206 //need to get new MAP position and set the offset of the arrays
|
andrew@33
|
207 //currently bestEstimate is the approx for the new MAP position
|
andrew@33
|
208
|
andrew@33
|
209 lastPlayedPitch = pitch;
|
andrew@33
|
210 //add the new event to our played information matrix
|
andrew@33
|
211 IntVector v;
|
andrew@33
|
212 v.push_back(pitch);
|
andrew@33
|
213 v.push_back(velocity);
|
andrew@33
|
214 playedNoteOnMatrix.push_back(v);
|
andrew@33
|
215
|
andrew@33
|
216
|
andrew@33
|
217 //would update the arrays at this point to show where out current location (phase) and tempo is.
|
andrew@33
|
218 // double timeNow = ofGetElapsedTimeMillis() - startTime;
|
andrew@33
|
219 double timeNow = timePlayed;// - startTime;
|
andrew@33
|
220 recentNoteOnTime = timePlayed;
|
andrew@33
|
221
|
andrew@33
|
222 // printf("Max time %f OF time %f \n", timePlayed, timeNow);
|
andrew@33
|
223
|
andrew@33
|
224 playedEventTimes.push_back(timePlayed);
|
andrew@33
|
225
|
andrew@33
|
226 // double timeDifference = ofGetElapsedTimeMillis() - bayesStruct.lastEventTime;
|
andrew@33
|
227 double timeDifference = timePlayed - bayesStruct.lastEventTime;
|
andrew@33
|
228
|
andrew@33
|
229 //printf("note %i played at %f and last event %f time difference %f and current best estmate %f\n", pitch, timePlayed, bayesStruct.lastEventTime, timeDifference, bayesStruct.bestEstimate);
|
andrew@33
|
230
|
andrew@33
|
231 //addnoise to the tempo distribution
|
andrew@33
|
232 //bayesStruct.decaySpeedDistribution(timeDifference);
|
andrew@33
|
233
|
andrew@33
|
234 if (timeDifference > 50){
|
andrew@33
|
235 bayesStruct.addGaussianNoiseToSpeedPosterior(timeDifference * 10.0 / 100.);
|
andrew@33
|
236 // bayesStruct.addTriangularNoiseToSpeedPosterior(timeDifference * 10 / 100.);
|
andrew@33
|
237 }
|
andrew@33
|
238
|
andrew@34
|
239 // bayesStruct.updateTmpBestEstimate(timeDifference);// debug - didnt work bayesStruct.bestEstimate = bayesStruct.tmpBestEstimate;
|
andrew@33
|
240 bayesStruct.updateBestEstimate(timeDifference);
|
andrew@34
|
241
|
andrew@33
|
242 bayesStruct.lastBestEstimateUpdateTime = getTimeNow(timePlayed);
|
andrew@34
|
243 //updatePeriodValue(bayesStruct.lastBestEstimateUpdateTime);
|
andrew@34
|
244
|
andrew@33
|
245 // double newMAPestimateTime = bayesStruct.posterior.getIndexInRealTerms(bayesStruct.posterior.MAPestimate);
|
andrew@33
|
246 //was offset + bayesStruct.posterior.MAPestimate; but this doesnt include scalar to convert to millis
|
andrew@33
|
247
|
andrew@33
|
248 timeString = "Pitch:"+ofToString(pitch);
|
andrew@33
|
249 timeString += ", time now:"+ofToString(timeNow, 1);
|
andrew@33
|
250 timeString += " TD "+ofToString(timeDifference, 1);
|
andrew@33
|
251 timeString += " offset "+ofToString(bayesStruct.posterior.offset , 0);
|
andrew@33
|
252 timeString += " map Est: "+ofToString(bayesStruct.posterior.MAPestimate, 0);
|
andrew@33
|
253 // timeString += " Previous time" + ofToString(newMAPestimateTime,0);
|
andrew@33
|
254 timeString += " speedMap "+ofToString(bayesStruct.relativeSpeedPosterior.integratedEstimate, 2);
|
andrew@33
|
255 timeString += " :: "+ofToString(bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.integratedEstimate), 2);
|
andrew@33
|
256
|
andrew@33
|
257 // newMAPestimateTime += (timeDifference * bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate));
|
andrew@33
|
258 // timeString += " : Predicted MAP time" + ofToString(newMAPestimateTime,0);
|
andrew@33
|
259
|
andrew@33
|
260 //then we recalculate the window start based on MAP being central
|
andrew@33
|
261 //then we do the matches on these and the likelihood on these.
|
andrew@33
|
262
|
andrew@46
|
263 bayesStruct.setNewDistributionOffsets(max(bayesStruct.posterior.offset, bayesStruct.bestEstimate - (bayesStruct.prior.scalar*bayesStruct.prior.arraySize/2)));
|
andrew@46
|
264 //bayesStruct.setNewDistributionOffsets(max(0.,newMAPestimateTime - (bayesStruct.prior.scalar*bayesStruct.prior.arraySize/2));
|
andrew@33
|
265
|
andrew@33
|
266 timeString += " \n : new offset " + ofToString(bayesStruct.prior.offset , 0);
|
andrew@33
|
267 timeString += " \n best estimate "+ofToString(bayesStruct.bestEstimate, 1);
|
andrew@33
|
268 timeString += " error "+ofToString(minimumMatchError, 0);
|
andrew@33
|
269 timeString += " map "+ofToString(bayesStruct.relativeSpeedPosterior.integratedEstimate, 1);
|
andrew@33
|
270 timeString += " rel speed "+ofToString(bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.integratedEstimate), 2);
|
andrew@33
|
271
|
andrew@33
|
272
|
andrew@33
|
273 //be able to draw the prior in correct location relative to the midi notes
|
andrew@33
|
274 //this calculates the cross update of all possible speeds and all possible positions
|
andrew@33
|
275 bayesStruct.crossUpdateArrays(bayesStruct.posterior, bayesStruct.relativeSpeedPosterior, timeDifference);
|
andrew@33
|
276
|
andrew@33
|
277
|
andrew@33
|
278 timeString += " new OFF "+ofToString(bayesStruct.bestEstimate - (bayesStruct.prior.scalar*bayesStruct.prior.arraySize/2), 1);
|
andrew@33
|
279 timeString += " notearrayindex "+ofToString(noteArrayIndex, 0);
|
andrew@33
|
280 //when this is off teh screen there is a problem somehow XXX
|
andrew@33
|
281
|
andrew@46
|
282 bayesStruct.posterior.offset = bayesStruct.prior.offset;
|
andrew@46
|
283 //max(0., bayesStruct.bestEstimate - (bayesStruct.prior.scalar*bayesStruct.prior.arraySize/2));// bayesStruct.prior.offset = max(0., bayesStruct.bestEstimate - (bayesStruct.prior.scalar*bayesStruct.prior.arraySize/2));
|
andrew@33
|
284
|
andrew@33
|
285 //trying to switch to prior
|
andrew@33
|
286
|
andrew@33
|
287
|
andrew@33
|
288 bayesStruct.lastEventTime = timePlayed;//bayesStruct.lastEventTime = ofGetElapsedTimeMillis();
|
andrew@33
|
289
|
andrew@33
|
290 //do the cross update to find current posterior for location
|
andrew@33
|
291 // totalConfidence= 0;
|
andrew@33
|
292 int numberOfMatchesFound = findLocalMatches(pitch);
|
andrew@33
|
293 setMatchLikelihoods(numberOfMatchesFound);
|
andrew@33
|
294 bayesStruct.calculatePosterior();
|
andrew@33
|
295
|
andrew@33
|
296 if (recordedEventTimes.size() > 0){
|
andrew@33
|
297 updateTempo();
|
andrew@33
|
298 //calcuateNewInterNoteIntervals();
|
andrew@33
|
299 }
|
andrew@34
|
300
|
andrew@46
|
301
|
andrew@34
|
302 //storedSmoothPlayPosition = smoothPlayPosition;
|
andrew@33
|
303
|
andrew@33
|
304 }
|
andrew@33
|
305
|
andrew@33
|
306 void midiEventHolder::updateTempo(){
|
andrew@33
|
307 //having found matches we have matches for new note and matches for previous notes
|
andrew@33
|
308 if (newOptimalMethod)
|
andrew@33
|
309 findOptimumTempoPairsToCurrentBestMatch();
|
andrew@33
|
310 else if (!confidenceWeightingUsed)
|
andrew@33
|
311 findLocalTempoPairs();
|
andrew@33
|
312 else
|
andrew@33
|
313 findLocalTempoPairsWeightedForConfidence();
|
andrew@33
|
314
|
andrew@33
|
315
|
andrew@33
|
316 //bayesStruct.addGaussianNoiseToSpeedPosterior(10);
|
andrew@33
|
317 }
|
andrew@33
|
318
|
andrew@33
|
319 double midiEventHolder::getTimeNow(double eventTime){
|
andrew@33
|
320 double timeNow = eventTime;
|
andrew@33
|
321 if (runningInRealTime)
|
andrew@33
|
322 timeNow = ofGetElapsedTimeMillis();
|
andrew@33
|
323 return timeNow;
|
andrew@33
|
324 }
|
andrew@33
|
325
|
andrew@33
|
326 int midiEventHolder::findLocalMatches(int notePitch){
|
andrew@33
|
327
|
andrew@33
|
328 //here we find the matches to the new note within appropriate range
|
andrew@33
|
329
|
andrew@33
|
330 matchString = "";
|
andrew@33
|
331
|
andrew@33
|
332 windowStartTime = max(0.0,(bayesStruct.bestEstimate - matchWindowWidth/2));//was playPositionInMillis
|
andrew@33
|
333 // cout << "best estimate is " << bayesStruct.bestEstimate << endl;
|
andrew@33
|
334 int numberOfMatches = findMatch(notePitch, windowStartTime, windowStartTime + matchWindowWidth);
|
andrew@33
|
335
|
andrew@33
|
336
|
andrew@33
|
337 //matchString += " pitch: "+ofToString(notePitch)+" matches "+ofToString(numberOfMatches)+" win start "+ofToString(windowStartTime);
|
andrew@33
|
338
|
andrew@33
|
339 return numberOfMatches;
|
andrew@33
|
340
|
andrew@33
|
341
|
andrew@33
|
342 }
|
andrew@33
|
343
|
andrew@33
|
344
|
andrew@33
|
345 void midiEventHolder::setMatchLikelihoods(int numberOfMatches){
|
andrew@33
|
346 //reset the offset to match the prior
|
andrew@33
|
347 bayesStruct.likelihood.offset = bayesStruct.prior.offset;
|
andrew@33
|
348 bayesStruct.likelihood.zero();//set to zero
|
andrew@33
|
349
|
andrew@33
|
350 double quantity = likelihoodToNoiseRatio / numberOfMatches;
|
andrew@33
|
351
|
andrew@33
|
352 for (int i = 0;i < numberOfMatches && matchesFound[i] >= 0 && matchesFound[i] < recordedEventTimes.size();i++){
|
andrew@33
|
353 // printf("match times %i of %i::%f adding likelihood to %f\n", i, numberOfMatches, recordedEventTimes[matchesFound[i]], recordedEventTimes[matchesFound[i]] - bayesStruct.likelihood.offset);
|
andrew@33
|
354 //this is the vent time since start of file
|
andrew@46
|
355 if (recordedEventTimes[matchesFound[i]] - bayesStruct.likelihood.offset < bayesStruct.likelihood.arraySize*bayesStruct.likelihood.scalar){
|
andrew@33
|
356 // double confidenceMeasure = 0;
|
andrew@33
|
357 // if (totalConfidence > 0)
|
andrew@33
|
358 // confidenceMeasure = bayesStruct.posterior.getValueAtMillis(recordedEventTimes[matchesFound[i]])/totalConfidence;
|
andrew@44
|
359
|
andrew@44
|
360 //bayesStruct.likelihood.addGaussianShape(recordedEventTimes[matchesFound[i]] - bayesStruct.likelihood.offset, likelihoodWidth, quantity);//* confidenceMeasure
|
andrew@44
|
361 bayesStruct.likelihood.addGaussianShapeFromRealTime(recordedEventTimes[matchesFound[i]], likelihoodWidth, quantity);//* confidenceMeasure
|
andrew@33
|
362 }//end if
|
andrew@33
|
363 }
|
andrew@33
|
364 bayesStruct.likelihood.addConstant((1-likelihoodToNoiseRatio)/bayesStruct.likelihood.length);
|
andrew@33
|
365 }
|
andrew@33
|
366
|
andrew@33
|
367 int midiEventHolder::findMatch(const int& notePitch, const int& startTime, const int& endTime){
|
andrew@33
|
368
|
andrew@33
|
369 matchesFound.clear();
|
andrew@33
|
370 int startIndex = 0;
|
andrew@33
|
371
|
andrew@33
|
372 if (recordedEventTimes.size() > 0){
|
andrew@33
|
373
|
andrew@33
|
374 //get to the right range of events to check in
|
andrew@33
|
375 while (startIndex < recordedEventTimes.size() && recordedEventTimes[startIndex] < startTime)
|
andrew@33
|
376 startIndex++;
|
andrew@33
|
377
|
andrew@33
|
378 }
|
andrew@33
|
379
|
andrew@33
|
380 IntVector v;
|
andrew@33
|
381 DoubleVector d;
|
andrew@33
|
382 double tmpError = 100000.;//v high error
|
andrew@33
|
383
|
andrew@33
|
384 double minimumConfidence = 0;
|
andrew@33
|
385 while (startIndex < recordedEventTimes.size() && recordedEventTimes[startIndex] < endTime){
|
andrew@33
|
386 if (recordedNoteOnMatrix[startIndex][1] == notePitch){
|
andrew@33
|
387
|
andrew@33
|
388 matchesFound.push_back(startIndex);
|
andrew@33
|
389 v.push_back(startIndex);
|
andrew@33
|
390 //so startIndex is registered as a match
|
andrew@33
|
391
|
andrew@33
|
392 double eventConfidence = bayesStruct.posterior.getValueAtMillis(recordedEventTimes[startIndex]);
|
andrew@33
|
393 if (eventConfidence > minimumConfidence){
|
andrew@33
|
394 minimumConfidence = eventConfidence;
|
andrew@33
|
395 bestMatchIndex = startIndex;
|
andrew@33
|
396 }
|
andrew@33
|
397 d.push_back(eventConfidence);
|
andrew@33
|
398
|
andrew@33
|
399 double confidence = eventConfidence;//bayesStruct.posterior.getValueAtMillis(mouseX);
|
andrew@33
|
400 // recordedEventTimes[startIndex]);
|
andrew@33
|
401 // matchString += "["+ofToString(startIndex)+"] = "+ofToString(confidence, 3)+" .";
|
andrew@33
|
402
|
andrew@33
|
403 if (abs(recordedEventTimes[startIndex] - bayesStruct.bestEstimate) < tmpError){
|
andrew@33
|
404 //record the error between expected and observed times
|
andrew@33
|
405 tmpError = abs(recordedEventTimes[startIndex] - bayesStruct.bestEstimate);
|
andrew@33
|
406 minimumMatchError = tmpError;//recordedEventTimes[startIndex] - bayesStruct.bestEstimate;
|
andrew@33
|
407 }
|
andrew@33
|
408
|
andrew@33
|
409 }
|
andrew@33
|
410 startIndex++;
|
andrew@33
|
411 }
|
andrew@33
|
412
|
andrew@33
|
413
|
andrew@33
|
414 // printf("%i MATCHES TO Note %i found\n", (int)matchesFound.size(), notePitch);
|
andrew@33
|
415 int size = matchesFound.size();
|
andrew@33
|
416 if (size > 0)
|
andrew@33
|
417 noteOnMatches[bestMatchIndex] = true;
|
andrew@33
|
418
|
andrew@33
|
419 v.insert(v.begin() , (int)size);//at beginning, we list how many matches there are that we have found
|
andrew@33
|
420 d.insert(d.begin() , (double)size);
|
andrew@33
|
421
|
andrew@33
|
422 //v.push_back(size);
|
andrew@33
|
423 //d.push_back(size);
|
andrew@33
|
424 //for (int i = 0;i < matchesFound.size()+1;i++){
|
andrew@33
|
425 // v.push_back(matchesFound[i]);
|
andrew@33
|
426 // printf("match %i,[%i] is %i\n", startIndex, i, v[i]);
|
andrew@33
|
427 //}
|
andrew@33
|
428
|
andrew@33
|
429
|
andrew@33
|
430 matchMatrix.push_back(v);
|
andrew@33
|
431 matchConfidence.push_back(d);
|
andrew@33
|
432
|
andrew@33
|
433 //bringing in way to list only the best matches and use these in tempo process
|
andrew@33
|
434 bestMatchFound.push_back(bestMatchIndex);
|
andrew@33
|
435
|
andrew@33
|
436 // printf("BEST MATCH TO note %i, start time %i, endtime %i, time %i is recorded time %i, confidence %0.2f\n", notePitch, startTime, endTime, (int) recordedEventTimes[bestMatchIndex], minimumConfidence);
|
andrew@33
|
437
|
andrew@33
|
438 return size;
|
andrew@33
|
439 }
|
andrew@33
|
440
|
andrew@33
|
441 bool midiEventHolder::checkIfMatchedNote(const int& tmpIndex){
|
andrew@33
|
442 for (int i = 0;i < matchesFound.size();i++){
|
andrew@33
|
443 if (matchesFound[i] == tmpIndex)
|
andrew@33
|
444 return true;
|
andrew@33
|
445 }
|
andrew@33
|
446 return false;
|
andrew@33
|
447 }
|
andrew@33
|
448
|
andrew@33
|
449
|
andrew@33
|
450
|
andrew@33
|
451 void midiEventHolder::findLocalTempoPairs(){
|
andrew@33
|
452
|
andrew@33
|
453 int currentPlayedIndex = playedNoteOnMatrix.size()-1;
|
andrew@33
|
454 // printf("played %i : %i, vel %i\n", currentPlayedIndex, playedNoteOnMatrix[currentPlayedIndex][0], playedNoteOnMatrix[currentPlayedIndex][1]);
|
andrew@33
|
455 // printMatchesFound();
|
andrew@33
|
456 // printMatchMatrix();
|
andrew@33
|
457 // printf("possible notes \n");
|
andrew@33
|
458 bool needToUpdate = false;
|
andrew@33
|
459 bayesStruct.setLikelihoodToConstant();
|
andrew@33
|
460
|
andrew@33
|
461
|
andrew@33
|
462 for (int i = 0;i < matchMatrix[currentPlayedIndex][0];i++){
|
andrew@33
|
463 //iterate through the recently matched events - even dodgy matches included
|
andrew@33
|
464 //size, index of match0, index of match1, ....
|
andrew@33
|
465
|
andrew@33
|
466
|
andrew@33
|
467 int recordedCurrentIndex = matchMatrix[currentPlayedIndex][i+1];
|
andrew@33
|
468
|
andrew@33
|
469 int previousIndex = currentPlayedIndex-1;
|
andrew@33
|
470
|
andrew@33
|
471
|
andrew@33
|
472 while (previousIndex >= 0 && playedEventTimes[previousIndex] + speedWindowWidthMillis > playedEventTimes[currentPlayedIndex]) {
|
andrew@33
|
473 double playedTimeDifference = playedEventTimes[currentPlayedIndex] - playedEventTimes[previousIndex];
|
andrew@33
|
474
|
andrew@33
|
475 for (int k = 0;k < matchMatrix[previousIndex][0];k++){
|
andrew@33
|
476
|
andrew@33
|
477 int recordedPreviousIndex = matchMatrix[previousIndex][k+1];
|
andrew@33
|
478
|
andrew@33
|
479 double recordedTimeDifference = recordedEventTimes[recordedCurrentIndex] - recordedEventTimes[recordedPreviousIndex];
|
andrew@33
|
480
|
andrew@33
|
481
|
andrew@33
|
482 //we want the speed of the recording relative to that of the playing live
|
andrew@33
|
483
|
andrew@33
|
484 double speedRatio = recordedTimeDifference / playedTimeDifference;
|
andrew@33
|
485 if (recordedTimeDifference > minimumTimeIntervalForTempoUpdate &&
|
andrew@33
|
486 speedRatio <= maximumMatchSpeed && speedRatio >= minimumMatchSpeed){
|
andrew@33
|
487
|
andrew@33
|
488 //adding in a prior that prefers 1
|
andrew@33
|
489 double priorWeighting = 1;
|
andrew@33
|
490 if (useTempoPrior)
|
andrew@33
|
491 priorWeighting = sin(speedRatio * PI/2);
|
andrew@33
|
492
|
andrew@33
|
493
|
andrew@33
|
494
|
andrew@33
|
495 /*
|
andrew@33
|
496 printf("(%i)", matchMatrix[currentPlayedIndex][i+1]);
|
andrew@33
|
497 printf("[%i] :: ", recordedPreviousIndex);
|
andrew@33
|
498 printf(" rec{%f} vs play(%f) ", recordedTimeDifference, playedTimeDifference);
|
andrew@33
|
499 printf("update on speed ratio %f\n", speedRatio);
|
andrew@33
|
500 */
|
andrew@33
|
501 // matchString += " speed: "+ofToString(speedRatio, 3);
|
andrew@33
|
502 // commented for debug
|
andrew@33
|
503
|
andrew@33
|
504 //bayesStruct.updateTempoDistribution(speedRatio, 0.1);//second paramter is confidence in the match
|
andrew@33
|
505 double amount = (1-bayesStruct.speedLikelihoodNoise)/10;
|
andrew@33
|
506 amount *= priorWeighting;
|
andrew@33
|
507 bayesStruct.updateTempoLikelihood(speedRatio, amount);
|
andrew@33
|
508 // tempoSpeedString += ofToString(recordedPreviousIndex) + " "+ ofToString(speedRatio, 2) + " "+ofToString(amount, 2) += " \n";
|
andrew@33
|
509 needToUpdate = true;
|
andrew@33
|
510 }
|
andrew@33
|
511 // printf("\n");
|
andrew@33
|
512 }
|
andrew@33
|
513
|
andrew@33
|
514 previousIndex--;
|
andrew@33
|
515 }//end while previousindex countdown
|
andrew@33
|
516 }//end for loop through possible current matches
|
andrew@33
|
517
|
andrew@33
|
518 if (needToUpdate)
|
andrew@33
|
519 bayesStruct.updateTempoDistribution();
|
andrew@33
|
520
|
andrew@33
|
521 //printf("current speed is %f\n", bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate));
|
andrew@33
|
522 }
|
andrew@33
|
523
|
andrew@33
|
524
|
andrew@33
|
525 void midiEventHolder::findLocalTempoPairsWeightedForConfidence(){
|
andrew@33
|
526 bool needToUpdate = false;
|
andrew@33
|
527
|
andrew@33
|
528 DoubleVector speedIntervalsFound;
|
andrew@33
|
529
|
andrew@33
|
530 //adapted this to just use the best match for each note
|
andrew@33
|
531
|
andrew@33
|
532 int currentPlayedIndex = playedNoteOnMatrix.size()-1;
|
andrew@33
|
533 // printf("played %i : %i, vel %i\n", currentPlayedIndex, playedNoteOnMatrix[currentPlayedIndex][0], playedNoteOnMatrix[currentPlayedIndex][1]);
|
andrew@33
|
534 // printMatchesFound();
|
andrew@33
|
535 // printMatchMatrix();
|
andrew@33
|
536 // printf("possible notes \n");
|
andrew@33
|
537
|
andrew@33
|
538 bayesStruct.setLikelihoodToConstant();
|
andrew@33
|
539
|
andrew@33
|
540 int recordedCurrentIndex = bestMatchFound[currentPlayedIndex];
|
andrew@33
|
541 //we only look at intervals between the current best match and other recent best matched notes
|
andrew@33
|
542 //that is the difference in confidence method
|
andrew@33
|
543
|
andrew@33
|
544
|
andrew@33
|
545 //printf("BEST MATCH FOUND for index %i is %i ", currentPlayedIndex, bestMatchFound[currentPlayedIndex]);
|
andrew@33
|
546
|
andrew@33
|
547 int previousIndex = currentPlayedIndex-1;
|
andrew@33
|
548
|
andrew@33
|
549 //withing speedwindow i.e. 4 seconds
|
andrew@33
|
550 while (previousIndex >= 0 && playedEventTimes[previousIndex] + speedWindowWidthMillis > playedEventTimes[currentPlayedIndex]) {
|
andrew@33
|
551 double playedTimeDifference = playedEventTimes[currentPlayedIndex] - playedEventTimes[previousIndex];
|
andrew@33
|
552
|
andrew@33
|
553 int recordedPreviousIndex = bestMatchFound[previousIndex];
|
andrew@33
|
554
|
andrew@33
|
555 double recordedTimeDifference = recordedEventTimes[recordedCurrentIndex] - recordedEventTimes[recordedPreviousIndex];
|
andrew@33
|
556
|
andrew@33
|
557
|
andrew@33
|
558 //we want the speed of the recording relative to that of the playing live
|
andrew@33
|
559
|
andrew@33
|
560 double speedRatio = recordedTimeDifference / playedTimeDifference;
|
andrew@33
|
561 if (recordedTimeDifference > minimumTimeIntervalForTempoUpdate
|
andrew@33
|
562 && speedRatio < maximumMatchSpeed && speedRatio > minimumMatchSpeed){
|
andrew@33
|
563
|
andrew@33
|
564 /* printf("(%i)", previousIndex);
|
andrew@33
|
565 printf("[%i] :: ", recordedPreviousIndex);
|
andrew@33
|
566 // printf(" conf %f & %f ", currentMatchConfidence, previousMatchConfidence);
|
andrew@33
|
567 printf(" rec{%f} vs play(%f) ", recordedTimeDifference, playedTimeDifference);
|
andrew@33
|
568 printf("update on speed ratio %f\n", speedRatio);
|
andrew@33
|
569 */
|
andrew@33
|
570 // matchString += " speed: "+ofToString(speedRatio, 3);
|
andrew@33
|
571 // commented for debug
|
andrew@33
|
572
|
andrew@33
|
573
|
andrew@33
|
574 double priorWeighting = 1;
|
andrew@33
|
575
|
andrew@33
|
576 if (useTempoPrior)
|
andrew@33
|
577 priorWeighting = sin(speedRatio * PI/2);//adding in a prior that prefers 1.0 speed
|
andrew@33
|
578
|
andrew@33
|
579
|
andrew@33
|
580 // double weighting = previousMatchConfidence * currentMatchConfidence ;
|
andrew@33
|
581 double amount = (1-bayesStruct.speedLikelihoodNoise)*priorWeighting/16;//was 9
|
andrew@33
|
582
|
andrew@33
|
583 speedIntervalsFound.push_back(speedRatio);
|
andrew@33
|
584 // bayesStruct.updateTempoLikelihood(speedRatio, amount);//second paramter is confidence in the match
|
andrew@33
|
585
|
andrew@33
|
586 // tempoSpeedString += ofToString(recordedCurrentIndex) + " :: " + ofToString(recordedPreviousIndex);
|
andrew@33
|
587 // tempoSpeedString += " " + ofToString(recordedTimeDifference)+ " " + ofToString(speedRatio, 2) + " "+ofToString(amount, 2) += " \n";
|
andrew@33
|
588
|
andrew@33
|
589 needToUpdate = true;
|
andrew@33
|
590 }
|
andrew@33
|
591 // printf("\n");
|
andrew@33
|
592
|
andrew@33
|
593
|
andrew@33
|
594 previousIndex--;
|
andrew@33
|
595 }//end while previousindex countdown
|
andrew@33
|
596
|
andrew@33
|
597 if (speedIntervalsFound.size() > 0){
|
andrew@33
|
598 double amount = (1 - bayesStruct.speedLikelihoodNoise) / speedIntervalsFound.size();
|
andrew@33
|
599 for (int i = 0;i < speedIntervalsFound.size();i++)
|
andrew@33
|
600 bayesStruct.updateTempoLikelihood(speedIntervalsFound[i], amount);
|
andrew@33
|
601 }
|
andrew@33
|
602
|
andrew@33
|
603
|
andrew@33
|
604 if (needToUpdate)
|
andrew@33
|
605 bayesStruct.updateTempoDistribution();
|
andrew@33
|
606 //printf("current speed is %f\n", bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate));
|
andrew@33
|
607 }
|
andrew@33
|
608
|
andrew@33
|
609 double midiEventHolder::getBestSpeedEstimate(const int& currentPlayedIndex, const int& equivalentRecordedIndex){
|
andrew@33
|
610 double estimate = 1.0;
|
andrew@33
|
611 if (bestMatchIndex > 0){
|
andrew@33
|
612 double accordingToFileLengthEstimate = recordedEventTimes[equivalentRecordedIndex] - recordedEventTimes[0];
|
andrew@33
|
613 double playedEquivalent = (playedEventTimes[currentPlayedIndex] - playedEventTimes[0]);
|
andrew@33
|
614 if (accordingToFileLengthEstimate > 0 && playedEquivalent > 0)
|
andrew@33
|
615 accordingToFileLengthEstimate /= playedEquivalent;
|
andrew@33
|
616 estimate = accordingToFileLengthEstimate;
|
andrew@33
|
617 }
|
andrew@33
|
618 return estimate;
|
andrew@33
|
619 }
|
andrew@33
|
620
|
andrew@33
|
621 void midiEventHolder::findOptimumTempoPairsToCurrentBestMatch(){
|
andrew@33
|
622 bool needToUpdate = false;
|
andrew@33
|
623
|
andrew@33
|
624 DoubleVector speedIntervalsFound;
|
andrew@33
|
625
|
andrew@33
|
626 double currentSpeedEstimate = bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate);
|
andrew@33
|
627
|
andrew@33
|
628 int currentPlayedIndex = playedNoteOnMatrix.size()-1;
|
andrew@33
|
629
|
andrew@33
|
630 bayesStruct.setLikelihoodToConstant();
|
andrew@33
|
631
|
andrew@33
|
632 int recordedCurrentIndex = bestMatchFound[currentPlayedIndex];
|
andrew@33
|
633 //we only look at intervals between the current best match and other recent best matched notes
|
andrew@33
|
634
|
andrew@33
|
635 //printf("BEST MATCH FOUND for index %i is %i ", currentPlayedIndex, bestMatchFound[currentPlayedIndex]);
|
andrew@33
|
636
|
andrew@33
|
637 int previousIndex = currentPlayedIndex-1;
|
andrew@33
|
638
|
andrew@33
|
639 //withing speedwindow i.e. 4 seconds
|
andrew@33
|
640 while (previousIndex >= 0 && playedEventTimes[previousIndex] + speedWindowWidthMillis > playedEventTimes[currentPlayedIndex]) {
|
andrew@33
|
641
|
andrew@33
|
642 double playedTimeDifference = playedEventTimes[currentPlayedIndex] - playedEventTimes[previousIndex];
|
andrew@33
|
643
|
andrew@33
|
644 int recordedPreviousIndex = bestMatchFound[previousIndex];
|
andrew@33
|
645
|
andrew@33
|
646 double recordedTimeDifference = recordedEventTimes[recordedCurrentIndex] - recordedEventTimes[recordedPreviousIndex];
|
andrew@33
|
647
|
andrew@33
|
648 //we want the speed of the recording relative to that of the playing live
|
andrew@33
|
649 double speedRatio = recordedTimeDifference / playedTimeDifference;
|
andrew@33
|
650
|
andrew@33
|
651 //now check if this can be closer the observed value
|
andrew@33
|
652 int checkRecordedCurrentIndex = recordedCurrentIndex;
|
andrew@33
|
653 int checkRecordedPreviousIndex ;//= recordedCurrentIndex;
|
andrew@33
|
654 int currentPlayedPitch = playedNoteOnMatrix[currentPlayedIndex][1];
|
andrew@33
|
655 int previousPlayedPitch = playedNoteOnMatrix[previousIndex][1];
|
andrew@33
|
656
|
andrew@33
|
657 double recordedTimeOfBestMatch = recordedEventTimes[recordedCurrentIndex];
|
andrew@33
|
658
|
andrew@33
|
659 //change this so we start first in window and go to end
|
andrew@33
|
660
|
andrew@33
|
661 while (checkRecordedCurrentIndex >= 0 && recordedEventTimes[checkRecordedCurrentIndex] > recordedTimeOfBestMatch - matchWindowWidth){
|
andrew@33
|
662
|
andrew@33
|
663 checkRecordedCurrentIndex--;
|
andrew@33
|
664 }
|
andrew@33
|
665
|
andrew@33
|
666 double bestSpeedEstimate = getBestSpeedEstimate(currentPlayedIndex, bestMatchIndex);
|
andrew@33
|
667
|
andrew@33
|
668 while (checkRecordedCurrentIndex < recordedEventTimes.size() && recordedEventTimes[checkRecordedCurrentIndex] < recordedTimeOfBestMatch + matchWindowWidth ){
|
andrew@33
|
669 if (recordedNoteOnMatrix[checkRecordedCurrentIndex][1] == currentPlayedPitch ){
|
andrew@33
|
670 checkRecordedPreviousIndex = checkRecordedCurrentIndex;
|
andrew@33
|
671 double recordedTimeCurrent = recordedEventTimes[checkRecordedCurrentIndex] ;
|
andrew@33
|
672 while (checkRecordedPreviousIndex >= 0 && recordedEventTimes[checkRecordedPreviousIndex] + maximumMatchSpeed*playedTimeDifference > recordedTimeCurrent ) {
|
andrew@33
|
673 if (recordedNoteOnMatrix[checkRecordedPreviousIndex][1] == previousPlayedPitch){
|
andrew@33
|
674 //we have a candidate
|
andrew@33
|
675 double speedToTest = recordedEventTimes[checkRecordedCurrentIndex] - recordedEventTimes[checkRecordedPreviousIndex];
|
andrew@33
|
676 speedToTest /= playedTimeDifference;
|
andrew@33
|
677 if (abs(speedToTest-currentSpeedEstimate) < abs(speedRatio - currentSpeedEstimate) ){
|
andrew@33
|
678 speedRatio = speedToTest;
|
andrew@33
|
679 }
|
andrew@33
|
680 }
|
andrew@33
|
681 checkRecordedPreviousIndex--;
|
andrew@33
|
682 }
|
andrew@33
|
683 }
|
andrew@33
|
684 checkRecordedCurrentIndex++;
|
andrew@33
|
685 }
|
andrew@33
|
686
|
andrew@33
|
687
|
andrew@33
|
688 if (recordedTimeDifference > minimumTimeIntervalForTempoUpdate
|
andrew@33
|
689 && speedRatio < maximumMatchSpeed && speedRatio > minimumMatchSpeed){
|
andrew@33
|
690
|
andrew@46
|
691 /* printf("(%i)", previousIndex);
|
andrew@33
|
692 printf("[%i] :: ", recordedPreviousIndex);
|
andrew@33
|
693 // printf(" conf %f & %f ", currentMatchConfidence, previousMatchConfidence);
|
andrew@33
|
694 printf(" rec{%f} vs play(%f) ", recordedTimeDifference, playedTimeDifference);
|
andrew@33
|
695 printf("update on speed ratio %f\n", speedRatio);
|
andrew@46
|
696 */
|
andrew@33
|
697 // matchString += " speed: "+ofToString(speedRatio, 3);
|
andrew@33
|
698 // commented for debug
|
andrew@33
|
699
|
andrew@33
|
700
|
andrew@33
|
701 double priorWeighting = 1;
|
andrew@33
|
702
|
andrew@33
|
703 if (useTempoPrior)
|
andrew@33
|
704 priorWeighting = sin(speedRatio * PI/2);//adding in a prior that prefers 1.0 speed
|
andrew@33
|
705
|
andrew@33
|
706
|
andrew@33
|
707 // double weighting = previousMatchConfidence * currentMatchConfidence ;
|
andrew@33
|
708 double amount = (1-bayesStruct.speedLikelihoodNoise)*priorWeighting/16;//was 9
|
andrew@33
|
709
|
andrew@33
|
710 speedIntervalsFound.push_back(speedRatio);
|
andrew@33
|
711 // bayesStruct.updateTempoLikelihood(speedRatio, amount);//second paramter is confidence in the match
|
andrew@33
|
712
|
andrew@33
|
713 // tempoSpeedString += ofToString(recordedCurrentIndex) + " :: " + ofToString(recordedPreviousIndex);
|
andrew@33
|
714 // tempoSpeedString += " " + ofToString(recordedTimeDifference)+ " " + ofToString(speedRatio, 2) + " "+ofToString(amount, 2) += " \n";
|
andrew@33
|
715
|
andrew@33
|
716 needToUpdate = true;
|
andrew@33
|
717 }
|
andrew@33
|
718 // printf("\n");
|
andrew@33
|
719
|
andrew@33
|
720
|
andrew@33
|
721 previousIndex--;
|
andrew@33
|
722 }//end while previousindex countdown
|
andrew@33
|
723
|
andrew@33
|
724 if (speedIntervalsFound.size() > 0){
|
andrew@33
|
725 double amount = (1 - bayesStruct.speedLikelihoodNoise) / speedIntervalsFound.size();
|
andrew@33
|
726 for (int i = 0;i < speedIntervalsFound.size();i++)
|
andrew@33
|
727 bayesStruct.updateTempoLikelihood(speedIntervalsFound[i], amount);
|
andrew@33
|
728 }
|
andrew@33
|
729
|
andrew@33
|
730
|
andrew@33
|
731 if (needToUpdate)
|
andrew@33
|
732 bayesStruct.updateTempoDistribution();
|
andrew@46
|
733
|
andrew@33
|
734 //printf("current speed is %f\n", bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate));
|
andrew@33
|
735 }
|
andrew@33
|
736
|
andrew@33
|
737
|
andrew@33
|
738 void midiEventHolder::calcuateNewInterNoteIntervals(){
|
andrew@33
|
739 DoubleVector v;
|
andrew@33
|
740
|
andrew@33
|
741 int currentPlayedIndex = playedNoteOnMatrix.size()-1;
|
andrew@33
|
742 // int recordedCurrentIndex = bestMatchFound[currentPlayedIndex];
|
andrew@33
|
743 int previousIndex = currentPlayedIndex-1;
|
andrew@33
|
744
|
andrew@33
|
745 //withing speedwindow i.e. 4 seconds
|
andrew@33
|
746 while (previousIndex >= 0 && playedEventTimes[previousIndex] + interNoteRange > playedEventTimes[currentPlayedIndex]) {
|
andrew@33
|
747
|
andrew@33
|
748 double playedTimeDifference = playedEventTimes[currentPlayedIndex] - playedEventTimes[previousIndex];
|
andrew@33
|
749
|
andrew@33
|
750 checkForCorrectInterval(playedTimeDifference, &v);
|
andrew@33
|
751
|
andrew@33
|
752 previousIndex--;
|
andrew@33
|
753 }
|
andrew@33
|
754
|
andrew@33
|
755 if (v.size() > 0)
|
andrew@33
|
756 interNoteIntervals.push_back(v);
|
andrew@33
|
757 //printf("\n");
|
andrew@33
|
758 }
|
andrew@33
|
759
|
andrew@33
|
760 void midiEventHolder::checkForCorrectInterval(const double& playedTimeDifference, DoubleVector* v){
|
andrew@33
|
761 double intervalDuration = 0.0;
|
andrew@33
|
762
|
andrew@33
|
763 for (int intervalIndex = 0;intervalIndex < 3;intervalIndex++){
|
andrew@33
|
764 //on;y check 1,2 and 4
|
andrew@33
|
765 double possibleDuration = playedTimeDifference / intervalsToCheck[intervalIndex];
|
andrew@33
|
766 if (possibleDuration >= 200 && possibleDuration < 400){
|
andrew@33
|
767 v->push_back(possibleDuration);
|
andrew@33
|
768 // printf("int %f / %i :: %f ", playedTimeDifference, intervalsToCheck[intervalIndex], possibleDuration);
|
andrew@33
|
769 }
|
andrew@33
|
770 }
|
andrew@33
|
771 }
|
andrew@33
|
772
|
andrew@33
|
773
|
andrew@33
|
774 void midiEventHolder::updatePlayPosition(){
|
andrew@34
|
775 //timeDifference = ofGetElapsedTimeMillis() - startPlayingTime;//elpased
|
andrew@33
|
776
|
andrew@33
|
777 //in actual fact if we are changing the speed of the play position
|
andrew@33
|
778 //we will need to update this via the file
|
andrew@33
|
779
|
andrew@33
|
780 //actually time since beginning of file i think
|
andrew@33
|
781
|
andrew@33
|
782 double timeDifference = 0;
|
andrew@34
|
783
|
andrew@34
|
784 if (runningInRealTime){
|
andrew@34
|
785
|
andrew@34
|
786 bayesStruct.updateBestEstimate(timeDifference);
|
andrew@34
|
787 // bayesStruct.updateTmpBestEstimate(timeDifference);
|
andrew@34
|
788 }
|
andrew@34
|
789
|
andrew@35
|
790
|
andrew@35
|
791
|
andrew@35
|
792 if (smoothPlayPosition < bayesStruct.bestEstimate){
|
andrew@35
|
793 updateSmoothPositionTo(bayesStruct.bestEstimate);
|
andrew@35
|
794 //smoothPlayPosition = bayesStruct.bestEstimate;
|
andrew@35
|
795 }
|
andrew@34
|
796
|
andrew@34
|
797 // playPositionInMillis = timeDifference;//based on updating from when we change period
|
andrew@34
|
798 //this to be added
|
andrew@34
|
799
|
andrew@33
|
800
|
andrew@33
|
801 //this is time diff in milliseconds
|
andrew@33
|
802 //then we have
|
andrew@33
|
803 double quarterNoteIntervals = (timeDifference / period);
|
andrew@33
|
804 tickLocation = quarterNoteIntervals * pulsesPerQuarternote;
|
andrew@33
|
805
|
andrew@33
|
806 updateNoteCounter();
|
andrew@33
|
807
|
andrew@33
|
808 }
|
andrew@33
|
809
|
andrew@35
|
810 void midiEventHolder::updateSmoothPositionTo(const double& newPosition){
|
andrew@42
|
811 //smooth play position was where we last outputted notes from.
|
andrew@42
|
812 //checking index is there to make sense.
|
andrew@35
|
813 while (smoothIndex > 0 && recordedEventTimes[smoothIndex] > smoothPlayPosition){
|
andrew@35
|
814 smoothIndex--;
|
andrew@42
|
815 //printf("going backewaers on smooth, ");
|
andrew@35
|
816 }
|
andrew@35
|
817 while (smoothIndex < recordedEventTimes.size()-1 && recordedEventTimes[smoothIndex] < smoothPlayPosition){
|
andrew@35
|
818 smoothIndex++;
|
andrew@42
|
819 //printf("outputting smooth\n ");
|
andrew@35
|
820 }
|
andrew@35
|
821
|
andrew@35
|
822
|
andrew@35
|
823 double playingTime = ofGetElapsedTimeMillis();
|
andrew@35
|
824 playingTime -= startPlayingTime;
|
andrew@35
|
825 //now at the last one
|
andrew@35
|
826
|
andrew@39
|
827 float smoothLocation = beatPositions[smoothIndex];
|
andrew@39
|
828 int currentNote = recordedNoteOnMatrix[smoothIndex][1];
|
andrew@36
|
829
|
andrew@35
|
830 while (smoothIndex < recordedEventTimes.size() && recordedEventTimes[smoothIndex] < newPosition){
|
andrew@36
|
831 float annotationTime = 0;
|
andrew@38
|
832 float annotationLocation = 0;
|
andrew@42
|
833 int annotationTick = 0;
|
andrew@36
|
834 int annotationNote = 0;
|
andrew@39
|
835 float difference = 10000;//very big
|
andrew@39
|
836 float currentLocationDifference = 1.0;
|
andrew@39
|
837 float range = 1.0;
|
andrew@36
|
838 if (smoothIndex < myNotation.rwcAnnotations.size()){
|
andrew@39
|
839 //add in test here to find closest matching note
|
andrew@39
|
840
|
andrew@42
|
841
|
andrew@36
|
842 annotationTime = myNotation.rwcAnnotations[smoothIndex].eventTime;
|
andrew@36
|
843 annotationNote = myNotation.rwcAnnotations[smoothIndex].midiNote;
|
andrew@38
|
844 annotationLocation = myNotation.rwcAnnotations[smoothIndex].beatLocation;
|
andrew@42
|
845 annotationTick = round(annotationLocation*480.0);
|
andrew@42
|
846 }else{
|
andrew@42
|
847 printf("No annotaion size %i\n", (int)myNotation.rwcAnnotations.size());
|
andrew@36
|
848 }
|
andrew@36
|
849
|
andrew@39
|
850 difference = playingTime - (annotationTime*1000.0);
|
andrew@36
|
851
|
andrew@35
|
852 if ((*fileOutput).is_open()){
|
andrew@36
|
853 (*fileOutput) << fixed << beatPositions[smoothIndex] <<",\t" << recordedNoteOnMatrix[smoothIndex][1] << ",\t";
|
andrew@36
|
854 (*fileOutput) << playingTime ;
|
andrew@37
|
855
|
andrew@36
|
856 if ( recordedNoteOnMatrix[smoothIndex][1] == annotationNote){
|
andrew@36
|
857 (*fileOutput) << " corresponds to " << annotationTime;
|
andrew@36
|
858 }
|
andrew@36
|
859 (*fileOutput) << " \n";
|
andrew@36
|
860
|
andrew@38
|
861
|
andrew@37
|
862
|
andrew@37
|
863 }
|
andrew@37
|
864
|
andrew@44
|
865 printf("annotaions: rec tick time %i vs %i midi %i beat pos %f playing time now at %f :: annotaion %i loc % f time %f diff \t%f ms\n",
|
andrew@42
|
866 recordedNoteOnMatrix[smoothIndex][0], annotationTick, recordedNoteOnMatrix[smoothIndex][1],
|
andrew@42
|
867 beatPositions[smoothIndex], playingTime,
|
andrew@42
|
868 annotationNote, annotationLocation, annotationTime, difference);
|
andrew@42
|
869
|
andrew@42
|
870 // assert(annotationNote == recordedNoteOnMatrix[smoothIndex][1]);
|
andrew@42
|
871 assert(annotationTick == recordedNoteOnMatrix[smoothIndex][0]);
|
andrew@42
|
872
|
andrew@42
|
873
|
andrew@37
|
874 if ((*differenceOutput).is_open()){
|
andrew@37
|
875 (*differenceOutput) << beatPositions[smoothIndex] << "," << difference << "\n";
|
andrew@42
|
876 // printf("midi %i beat pos %f playing time now at %f :: annotaion %i loc % f time %f diff \t%f ms\n",
|
andrew@42
|
877 // recordedNoteOnMatrix[smoothIndex][1],
|
andrew@42
|
878 // beatPositions[smoothIndex], playingTime,
|
andrew@42
|
879 // annotationNote, annotationLocation, annotationTime, difference);
|
andrew@42
|
880 }else{
|
andrew@42
|
881 printf("file not open\n");
|
andrew@35
|
882 }
|
andrew@35
|
883
|
andrew@35
|
884 smoothIndex++;
|
andrew@35
|
885 }
|
andrew@35
|
886
|
andrew@35
|
887
|
andrew@35
|
888 smoothPlayPosition = newPosition;
|
andrew@35
|
889
|
andrew@35
|
890 }
|
andrew@35
|
891
|
andrew@46
|
892 /*
|
andrew@34
|
893 void midiEventHolder::updatePeriodValue(const double& millis){
|
andrew@34
|
894
|
andrew@34
|
895 double tmp = period;
|
andrew@46
|
896
|
andrew@46
|
897 // while (periodCounter >= 0 && periodCounter < periodValues.size()-1 && periodValues[periodCounter][2] < millis){
|
andrew@46
|
898 // periodCounter++;
|
andrew@46
|
899 // }
|
andrew@46
|
900 // while (periodCounter > 0 && periodValues[periodCounter][2] > millis){
|
andrew@46
|
901 // periodCounter--;
|
andrew@46
|
902 // }
|
andrew@46
|
903 //
|
andrew@34
|
904 //period = periodValues[periodCounter][1];
|
andrew@34
|
905
|
andrew@34
|
906 if (period != tmp){
|
andrew@34
|
907 printf("new period at %f of %f\n", millis, period);
|
andrew@34
|
908 }
|
andrew@34
|
909 }
|
andrew@46
|
910 */
|
andrew@34
|
911
|
andrew@33
|
912 void midiEventHolder::updateNoteCounter(){
|
andrew@33
|
913 while (totalNoteCounterIndex < bestMatchIndex){
|
andrew@33
|
914 int tmpPitch = recordedNoteOnMatrix[totalNoteCounterIndex][1];
|
andrew@33
|
915 recordedTotalNoteCounterByPitch[tmpPitch] += 1;
|
andrew@33
|
916 totalNoteCounterIndex++;
|
andrew@33
|
917 }
|
andrew@33
|
918 }
|
andrew@33
|
919
|
andrew@33
|
920
|
andrew@33
|
921 void midiEventHolder::drawMidiFile(){
|
andrew@46
|
922 //ofBackground(80,80,80);
|
andrew@33
|
923
|
andrew@33
|
924 //draws midi file on scrolling screen
|
andrew@33
|
925 int size = recordedNoteOnMatrix.size();
|
andrew@33
|
926 if (size > 0){
|
andrew@33
|
927
|
andrew@33
|
928 numberOfScreensIn = floor(bayesStruct.bestEstimate / getEventTimeMillis(ticksPerScreen));//rpounds down on no screens in
|
andrew@33
|
929
|
andrew@33
|
930 // numberOfScreensIn = tickLocation / ticksPerScreen;//rounds down
|
andrew@33
|
931 timeOffsetForScreen = getEventTimeMillis(numberOfScreensIn * ticksPerScreen);
|
andrew@33
|
932
|
andrew@33
|
933 while (noteArrayIndex < recordedNoteOnMatrix.size()-1 && tickLocation > recordedNoteOnMatrix[noteArrayIndex][0] )
|
andrew@33
|
934 noteArrayIndex++;
|
andrew@33
|
935
|
andrew@33
|
936
|
andrew@33
|
937 while (noteArrayIndex > 0 && noteArrayIndex < size && tickLocation < recordedNoteOnMatrix[noteArrayIndex][0])
|
andrew@33
|
938 noteArrayIndex--;
|
andrew@33
|
939
|
andrew@33
|
940 //need to start where we currently are in file
|
andrew@33
|
941 int maxNoteIndexToPrint = noteArrayIndex;
|
andrew@33
|
942 int minNoteIndexToPrint = min(size-1,noteArrayIndex);//not needed as changed above
|
andrew@33
|
943
|
andrew@33
|
944 while (maxNoteIndexToPrint < recordedNoteOnMatrix.size() && recordedNoteOnMatrix[maxNoteIndexToPrint][0] < (numberOfScreensIn+1)*ticksPerScreen )
|
andrew@33
|
945 maxNoteIndexToPrint++;
|
andrew@33
|
946
|
andrew@33
|
947 while (minNoteIndexToPrint > 0 && recordedNoteOnMatrix[minNoteIndexToPrint][0] > numberOfScreensIn*ticksPerScreen)//&& minNoteIndexToPrint < size
|
andrew@33
|
948 minNoteIndexToPrint--;
|
andrew@33
|
949
|
andrew@33
|
950 for (int tmpIndex = max(0,minNoteIndexToPrint);tmpIndex < min(maxNoteIndexToPrint, (int)recordedNoteOnMatrix.size());tmpIndex++){
|
andrew@33
|
951
|
andrew@33
|
952 ofSetColor(255,255,255);
|
andrew@33
|
953 if (checkIfMatchedNote(tmpIndex))
|
andrew@33
|
954 ofSetColor(100,100,100);//0,0,255);
|
andrew@33
|
955 else if(noteOnMatches[tmpIndex]){
|
andrew@33
|
956 ofSetColor(255,0,255);//dark grey
|
andrew@33
|
957 }
|
andrew@33
|
958 else{
|
andrew@33
|
959 ofSetColor(255,255,255);//255,255,255);
|
andrew@33
|
960 }
|
andrew@33
|
961
|
andrew@33
|
962 //ofSetColor(255,255,255);
|
andrew@33
|
963 if (tmpIndex == bestMatchIndex)
|
andrew@33
|
964 ofSetColor(255,0,0);//best recent match is in red
|
andrew@33
|
965
|
andrew@33
|
966 // XXX replace ofgetwidth below
|
andrew@33
|
967 //if (tmpIndex >= 0 && tmpIndex < size)
|
andrew@33
|
968 int xLocation = (float)(recordedNoteOnMatrix[tmpIndex][0] - numberOfScreensIn*ticksPerScreen)*(*screenWidth)/(float)ticksPerScreen;
|
andrew@33
|
969 int duration = (float)(recordedNoteOnMatrix[tmpIndex][3]*(*screenWidth))/(float)ticksPerScreen;
|
andrew@33
|
970
|
andrew@33
|
971
|
andrew@33
|
972 int yLocation = (*screenHeight) - ((recordedNoteOnMatrix[tmpIndex][1] - noteMinimum )*(*screenHeight)/ (float)(noteMaximum - noteMinimum));
|
andrew@33
|
973 ofRect(xLocation,yLocation, duration, noteHeight);
|
andrew@33
|
974
|
andrew@33
|
975 }
|
andrew@33
|
976
|
andrew@33
|
977
|
andrew@33
|
978 int xLocation;// = getLocationFromTicks(tickLocation);
|
andrew@33
|
979 // ofLine(xLocation, 0, xLocation, (*screenHeight));
|
andrew@33
|
980
|
andrew@33
|
981 //orange line at best estimate
|
andrew@33
|
982 xLocation = getLocationFromMillis(bayesStruct.bestEstimate);
|
andrew@34
|
983 ofSetColor(250,250,20);//250,100,0);
|
andrew@33
|
984 ofLine(xLocation, 0, xLocation, (*screenHeight));
|
andrew@33
|
985
|
andrew@34
|
986 xLocation = getLocationFromMillis(smoothPlayPosition);//bayesStruct.tmpBestEstimate
|
andrew@34
|
987 ofSetColor(0,250,0);//250,150, 250,100,0);
|
andrew@33
|
988 ofLine(xLocation, 0, xLocation, (*screenHeight));
|
andrew@33
|
989
|
andrew@33
|
990
|
andrew@33
|
991 //lines where matching window start and end are
|
andrew@33
|
992 ofSetColor(0);//0,100,255);
|
andrew@33
|
993 xLocation = getLocationFromMillis(windowStartTime);
|
andrew@33
|
994 ofLine(xLocation, 0, xLocation, (*screenHeight));
|
andrew@33
|
995 xLocation = getLocationFromMillis(windowStartTime+matchWindowWidth);
|
andrew@33
|
996 ofLine(xLocation, 0, xLocation, (*screenHeight));
|
andrew@33
|
997
|
andrew@33
|
998
|
andrew@33
|
999 int maxSize = recordedNoteOnMatrix[size-1][0];
|
andrew@33
|
1000
|
andrew@33
|
1001 int tmpIndex = 0;
|
andrew@33
|
1002 while (tmpIndex < measureVector.size() && measureVector[tmpIndex] < (numberOfScreensIn+1)*ticksPerScreen){
|
andrew@33
|
1003 int measureLocation = measureVector[tmpIndex];
|
andrew@33
|
1004 int xLocation = (float)(measureLocation - numberOfScreensIn*ticksPerScreen)*(*screenWidth)/(float)ticksPerScreen;
|
andrew@33
|
1005 ofSetColor(155,155,0);
|
andrew@33
|
1006 ofLine(xLocation, 0, xLocation, (*screenHeight));
|
andrew@33
|
1007 tmpIndex++;
|
andrew@33
|
1008 }
|
andrew@33
|
1009
|
andrew@33
|
1010
|
andrew@33
|
1011 // ofDrawBitmapString(tempoSpeedString, 20, 20);
|
andrew@33
|
1012 /* string indexString = "num screens in "+ofToString(numberOfScreensIn)+"; min index to print "+ofToString(minNoteIndexToPrint)+", max index to print "+ofToString(maxNoteIndexToPrint);
|
andrew@33
|
1013 indexString += " size "+ofToString(size)+" tick loc "+ofToString(tickLocation)+" max size "+ofToString(maxSize);
|
andrew@33
|
1014 ofDrawBitmapString(indexString, 20, 40);
|
andrew@33
|
1015 */
|
andrew@33
|
1016 }
|
andrew@33
|
1017
|
andrew@33
|
1018 //ofDrawBitmapString(ofToString(timeOffsetForScreen, 1), 20,20);
|
andrew@46
|
1019 ofSetColor(255,255,255);
|
andrew@46
|
1020 ofDrawBitmapString(timeString, 20, 60);
|
andrew@33
|
1021
|
andrew@33
|
1022 //last played piutch
|
andrew@33
|
1023 ofSetColor(0,200,0,50);
|
andrew@33
|
1024 int yLocation = (*screenHeight) - ((lastPlayedPitch - noteMinimum )*(*screenHeight)/ (float)(noteMaximum - noteMinimum));
|
andrew@33
|
1025 ofRect(0,yLocation, 100, noteHeight);
|
andrew@33
|
1026
|
andrew@33
|
1027
|
andrew@33
|
1028
|
andrew@33
|
1029 }
|
andrew@33
|
1030
|
andrew@33
|
1031
|
andrew@33
|
1032
|
andrew@33
|
1033 void midiEventHolder::drawMidiFile(IntMatrix& midiFileToDraw){
|
andrew@33
|
1034
|
andrew@33
|
1035 //using this to draw the live input
|
andrew@33
|
1036
|
andrew@33
|
1037 //draws midi file on scrolling screen
|
andrew@33
|
1038 int size = midiFileToDraw.size();
|
andrew@33
|
1039 if (size > 0){
|
andrew@33
|
1040
|
andrew@33
|
1041 numberOfScreensIn = floor(bayesStruct.bestEstimate / getEventTimeMillis(ticksPerScreen));//rpounds down on no screens in
|
andrew@33
|
1042
|
andrew@33
|
1043 // numberOfScreensIn = tickLocation / ticksPerScreen;//rounds down
|
andrew@33
|
1044 timeOffsetForScreen = getEventTimeMillis(numberOfScreensIn * ticksPerScreen);
|
andrew@33
|
1045
|
andrew@33
|
1046 while (noteArrayIndex < midiFileToDraw.size()-1 && tickLocation > midiFileToDraw[noteArrayIndex][0] )
|
andrew@33
|
1047 noteArrayIndex++;
|
andrew@33
|
1048
|
andrew@33
|
1049
|
andrew@33
|
1050 while (noteArrayIndex > 0 && noteArrayIndex < size && tickLocation < midiFileToDraw[noteArrayIndex][0])
|
andrew@33
|
1051 noteArrayIndex--;
|
andrew@33
|
1052
|
andrew@33
|
1053 //need to start where we currently are in file
|
andrew@33
|
1054 int maxNoteIndexToPrint = noteArrayIndex;
|
andrew@33
|
1055 int minNoteIndexToPrint = min(size-1,noteArrayIndex);//not needed as changed above
|
andrew@33
|
1056
|
andrew@33
|
1057 while (maxNoteIndexToPrint < midiFileToDraw.size() && midiFileToDraw[maxNoteIndexToPrint][0] < (numberOfScreensIn+1)*ticksPerScreen )
|
andrew@33
|
1058 maxNoteIndexToPrint++;
|
andrew@33
|
1059
|
andrew@33
|
1060 while (minNoteIndexToPrint > 0 && midiFileToDraw[minNoteIndexToPrint][0] > numberOfScreensIn*ticksPerScreen)//&& minNoteIndexToPrint < size
|
andrew@33
|
1061 minNoteIndexToPrint--;
|
andrew@33
|
1062
|
andrew@33
|
1063 for (int tmpIndex = max(0,minNoteIndexToPrint);tmpIndex < min(maxNoteIndexToPrint, (int)midiFileToDraw.size());tmpIndex++){
|
andrew@33
|
1064
|
andrew@33
|
1065 ofSetColor(0,0,255, 200);
|
andrew@33
|
1066
|
andrew@33
|
1067 int xLocation = (float)(midiFileToDraw[tmpIndex][0] - numberOfScreensIn*ticksPerScreen)*(*screenWidth)/(float)ticksPerScreen;
|
andrew@33
|
1068 int duration = (float)(midiFileToDraw[tmpIndex][3]*(*screenWidth))/(float)ticksPerScreen;
|
andrew@33
|
1069
|
andrew@33
|
1070
|
andrew@33
|
1071 int yLocation = (*screenHeight) - ((midiFileToDraw[tmpIndex][1] - noteMinimum )*(*screenHeight)/ (float)(noteMaximum - noteMinimum));
|
andrew@33
|
1072 ofRect(xLocation,yLocation, duration, noteHeight);
|
andrew@33
|
1073
|
andrew@33
|
1074 }
|
andrew@33
|
1075
|
andrew@33
|
1076
|
andrew@33
|
1077
|
andrew@33
|
1078 }
|
andrew@33
|
1079
|
andrew@33
|
1080
|
andrew@33
|
1081
|
andrew@33
|
1082 }
|
andrew@33
|
1083
|
andrew@33
|
1084
|
andrew@33
|
1085
|
andrew@33
|
1086 void midiEventHolder::drawFile(){
|
andrew@33
|
1087 drawMidiFile();
|
andrew@33
|
1088
|
andrew@34
|
1089 ofSetColor(0,0,255);
|
andrew@34
|
1090 ofDrawBitmapString("period"+ofToString(period, 2), ofGetWidth() - 180, 20);
|
andrew@33
|
1091
|
andrew@33
|
1092 // bayesStruct.drawArrays();
|
andrew@33
|
1093
|
andrew@33
|
1094 // ofSetColor(200,200,0);
|
andrew@33
|
1095 // bayesStruct.prior.drawConstrainedVector(0, bayesStruct.prior.arraySize, 400, 800);
|
andrew@33
|
1096
|
andrew@33
|
1097 //need to draw arrays within correct timescope
|
andrew@33
|
1098 if (drawPhaseMode)
|
andrew@33
|
1099 bayesStruct.drawArraysRelativeToTimeframe(timeOffsetForScreen, timeOffsetForScreen + getEventTimeMillis(ticksPerScreen));
|
andrew@33
|
1100
|
andrew@33
|
1101 if (drawTempoMode)
|
andrew@40
|
1102 bayesStruct.drawTempoArrays();
|
andrew@33
|
1103
|
andrew@33
|
1104
|
andrew@33
|
1105 ofSetColor(0, 0, 0);
|
andrew@33
|
1106 //ofDrawBitmapString(matchString, 20, ofGetHeight() - 20);
|
andrew@33
|
1107
|
andrew@33
|
1108 double confidence = bayesStruct.posterior.getValueAtMillis(mouseX);
|
andrew@33
|
1109 /*
|
andrew@33
|
1110 string mouseString = "mouseX "+ofToString(confidence, 3)+" .";
|
andrew@33
|
1111 ofDrawBitmapString(mouseString, 20 , ofGetHeight() - 40);
|
andrew@33
|
1112
|
andrew@33
|
1113 string mouseString = "updateCounter "+ofToString(bayesStruct.updateCounter);
|
andrew@33
|
1114 ofDrawBitmapString(mouseString, 20 , ofGetHeight() - 40);
|
andrew@33
|
1115
|
andrew@33
|
1116 string infostring = "speed "+ofToString(bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate), 3);
|
andrew@33
|
1117 ofDrawBitmapString(infostring, 20 , ofGetHeight() - 60);
|
andrew@33
|
1118 */
|
andrew@33
|
1119
|
andrew@33
|
1120 //drawInterNoteIntervals();
|
andrew@33
|
1121
|
andrew@33
|
1122 }
|
andrew@33
|
1123
|
andrew@33
|
1124 void midiEventHolder::drawInterNoteIntervals(){
|
andrew@33
|
1125
|
andrew@33
|
1126 ofSetColor(0,0,150);
|
andrew@33
|
1127 int size = interNoteIntervals.size();
|
andrew@33
|
1128 int numberToShow = min(100, size);
|
andrew@33
|
1129 double x ;
|
andrew@33
|
1130 for (int y = 1;y < numberToShow;y++){
|
andrew@33
|
1131 for (int point = 0;point < interNoteIntervals[y].size();point++){
|
andrew@33
|
1132 double interval = interNoteIntervals[size - y][point];
|
andrew@33
|
1133 x = interval - 200;
|
andrew@33
|
1134 x *= (*screenWidth) / 200.0;
|
andrew@33
|
1135 }
|
andrew@33
|
1136 double h = (double)(y * (*screenHeight)) / numberToShow;
|
andrew@33
|
1137 ofCircle(x, h, 5);
|
andrew@33
|
1138 }
|
andrew@33
|
1139
|
andrew@33
|
1140 }
|
andrew@33
|
1141
|
andrew@33
|
1142
|
andrew@33
|
1143 void midiEventHolder::printInterNoteIntervals(){
|
andrew@33
|
1144
|
andrew@33
|
1145 int size = interNoteIntervals.size();
|
andrew@33
|
1146 int numberToShow = 20;
|
andrew@33
|
1147 double x ;
|
andrew@33
|
1148 for (int y = max(0, size - numberToShow);y < interNoteIntervals.size();y++){
|
andrew@33
|
1149 for (int point = 0;point < interNoteIntervals[y].size();point++){
|
andrew@33
|
1150 printf("[%i][%i] : %f", y, point, interNoteIntervals[y][point]);
|
andrew@33
|
1151 }
|
andrew@33
|
1152 printf("\n");
|
andrew@33
|
1153 }
|
andrew@33
|
1154
|
andrew@33
|
1155 }
|
andrew@33
|
1156
|
andrew@46
|
1157 //int midiEventHolder::getLocationFromTicks(double tickPosition){
|
andrew@46
|
1158 // return 0;
|
andrew@34
|
1159 // return (int)((float)(tickPosition - numberOfScreensIn*ticksPerScreen)*(*screenWidth)/(float)ticksPerScreen);
|
andrew@34
|
1160 //not used
|
andrew@46
|
1161 //}
|
andrew@33
|
1162
|
andrew@33
|
1163 int midiEventHolder::getLocationFromMillis(double millisPosition){
|
andrew@33
|
1164 //(getEventTimeTicks(windowStartTime+matchWindowWidth) - numberOfScreensIn*ticksPerScreen)*(*screenWidth) / (double)ticksPerScreen
|
andrew@33
|
1165 return (millisPosition - timeOffsetForScreen)*(*screenWidth)/getEventTimeMillis(ticksPerScreen);
|
andrew@33
|
1166 }
|
andrew@33
|
1167
|
andrew@46
|
1168 /*
|
andrew@33
|
1169 void midiEventHolder::exampleCrossUpdate(){
|
andrew@33
|
1170
|
andrew@33
|
1171 bayesStruct.crossUpdateArrays(bayesStruct.posterior, bayesStruct.relativeSpeedPosterior, 200);
|
andrew@33
|
1172
|
andrew@33
|
1173 }
|
andrew@46
|
1174 */
|
andrew@33
|
1175
|
andrew@33
|
1176 void midiEventHolder::setStartPlayingTimes(){
|
andrew@34
|
1177 startPlayingTime = getTimeNow(0);//ofGetElapsedTimeMillis();
|
andrew@34
|
1178 //startTime = startPlayingTime;
|
andrew@42
|
1179 printf("starting playing at time %f\n", startPlayingTime);
|
andrew@33
|
1180 /*
|
andrew@33
|
1181 bayesStruct.lastEventTime = 0;//ofGetElapsedTimeMillis();
|
andrew@33
|
1182 bayesStruct.bestEstimate = 0;
|
andrew@33
|
1183 bayesStruct.resetArrays();
|
andrew@33
|
1184 bayesStruct.lastBestEstimateUpdateTime = ofGetElapsedTimeMillis();
|
andrew@33
|
1185 */
|
andrew@33
|
1186 bayesStruct.setStartPlaying();
|
andrew@33
|
1187 matchString = "";
|
andrew@33
|
1188 }
|
andrew@33
|
1189
|
andrew@33
|
1190
|
andrew@33
|
1191 void midiEventHolder::printMatchMatrix(){
|
andrew@33
|
1192 printf("match matrix:\n");
|
andrew@33
|
1193 for (int i = 0;i < matchMatrix.size();i++){
|
andrew@33
|
1194 for (int k = 0;k < matchMatrix[i].size();k++){
|
andrew@33
|
1195 printf("%i , ", matchMatrix[i][k]);
|
andrew@33
|
1196 }
|
andrew@33
|
1197 printf("\n");
|
andrew@33
|
1198 }
|
andrew@33
|
1199
|
andrew@33
|
1200 }
|
andrew@33
|
1201
|
andrew@33
|
1202
|
andrew@33
|
1203
|
andrew@33
|
1204 void midiEventHolder::printRecordedEvents(){
|
andrew@33
|
1205 printf("Recorded Events:\n");
|
andrew@33
|
1206 for (int i = 0;i < recordedNoteOnMatrix.size();i++){
|
andrew@33
|
1207 for (int k = 0;k < recordedNoteOnMatrix[i].size();k++){
|
andrew@33
|
1208 printf("[%i] = %i ,", i, recordedNoteOnMatrix[i][k]);
|
andrew@33
|
1209 }
|
andrew@33
|
1210 if (i < recordedEventTimes.size())
|
andrew@33
|
1211 printf("time %f \n", recordedEventTimes[i]);
|
andrew@33
|
1212 else
|
andrew@33
|
1213 printf("\n");
|
andrew@33
|
1214 }
|
andrew@33
|
1215
|
andrew@33
|
1216 }
|
andrew@33
|
1217
|
andrew@33
|
1218
|
andrew@33
|
1219
|
andrew@33
|
1220 void midiEventHolder::reorderMatrixFromNoteTimes(IntMatrix& noteOnMatrix){
|
andrew@33
|
1221 double currentTime = -19999.;
|
andrew@33
|
1222 for (int i = 0;i < noteOnMatrix.size();i++){
|
andrew@33
|
1223 int nextIndex = getIndexOfMinimumAboveTime(currentTime, noteOnMatrix);
|
andrew@33
|
1224 // cout << "index of min time " << currentTime << " is " << nextIndex << " at time " << noteOnMatrix[nextIndex][0] << endl;
|
andrew@33
|
1225
|
andrew@33
|
1226 if (nextIndex >= 0 && nextIndex > i && noteOnMatrix[nextIndex][0] < noteOnMatrix[i][0] ){
|
andrew@33
|
1227 //which it should be
|
andrew@33
|
1228 // cout << " index " << nextIndex << " at time " << noteOnMatrix[nextIndex][0] << " swaps with inex " << i << " at time " << noteOnMatrix[i][0] << endl;
|
andrew@33
|
1229 noteOnMatrix[i].swap(noteOnMatrix[nextIndex]);
|
andrew@35
|
1230 // double tmp = beatPositions[i];
|
andrew@35
|
1231 // beatPositions[i] = beatPositions[nextIndex];
|
andrew@35
|
1232 // = tmp;
|
andrew@35
|
1233
|
andrew@35
|
1234 swap (beatPositions[i], beatPositions[nextIndex]);
|
andrew@35
|
1235
|
andrew@35
|
1236
|
andrew@33
|
1237 currentTime = noteOnMatrix[i][0];
|
andrew@33
|
1238 }
|
andrew@33
|
1239
|
andrew@33
|
1240 }
|
andrew@33
|
1241 //printRecordedEvents();
|
andrew@33
|
1242
|
andrew@33
|
1243 }
|
andrew@33
|
1244
|
andrew@33
|
1245
|
andrew@33
|
1246
|
andrew@33
|
1247
|
andrew@33
|
1248 void midiEventHolder::doublecheckOrder(IntMatrix& noteOnMatrix){
|
andrew@33
|
1249
|
andrew@33
|
1250 for (int i = 0;i < noteOnMatrix.size();i++){
|
andrew@33
|
1251 int nextIndex = getIndexOfMinimumAboveIndex(i, noteOnMatrix);
|
andrew@33
|
1252 if (nextIndex > i){
|
andrew@33
|
1253 noteOnMatrix[i].swap(noteOnMatrix[nextIndex]);
|
andrew@35
|
1254 swap (beatPositions[i], beatPositions[nextIndex]);
|
andrew@35
|
1255
|
andrew@33
|
1256 }
|
andrew@33
|
1257 }
|
andrew@33
|
1258 }
|
andrew@33
|
1259
|
andrew@33
|
1260 int midiEventHolder::getIndexOfMinimumAboveIndex(const int& index, IntMatrix& noteOnMatrix){
|
andrew@33
|
1261 int returnIndex = index;
|
andrew@33
|
1262 int min = noteOnMatrix[index][0];
|
andrew@33
|
1263 for (int i = index;i < noteOnMatrix.size();i++){
|
andrew@33
|
1264 if (noteOnMatrix[i][0] < min){
|
andrew@33
|
1265 returnIndex = i;
|
andrew@33
|
1266 min = noteOnMatrix[i][0];
|
andrew@33
|
1267 }
|
andrew@33
|
1268 }
|
andrew@33
|
1269 return returnIndex;
|
andrew@33
|
1270 }
|
andrew@33
|
1271
|
andrew@33
|
1272
|
andrew@33
|
1273 int midiEventHolder::getIndexOfMinimumAboveTime(const double& time, IntMatrix& noteOnMatrix){
|
andrew@33
|
1274 int index = 0;
|
andrew@33
|
1275 double minimumTime = 100000000.;
|
andrew@33
|
1276 int bestIndex = -1;
|
andrew@33
|
1277 while (index < noteOnMatrix.size()){
|
andrew@33
|
1278
|
andrew@33
|
1279 if (noteOnMatrix[index][0] > time && noteOnMatrix[index][0] < minimumTime){
|
andrew@33
|
1280 bestIndex = index;
|
andrew@33
|
1281 minimumTime = noteOnMatrix[index][0];
|
andrew@33
|
1282 }
|
andrew@33
|
1283 index++;
|
andrew@33
|
1284 }
|
andrew@33
|
1285 return bestIndex;
|
andrew@33
|
1286 }
|
andrew@33
|
1287
|
andrew@33
|
1288
|
andrew@33
|
1289
|
andrew@33
|
1290
|
andrew@33
|
1291 void midiEventHolder::correctTiming(IntMatrix& noteOnMatrix){
|
andrew@33
|
1292
|
andrew@33
|
1293 if (noteOnMatrix.size() > 0 && noteOnMatrix[0][0] < 0) {
|
andrew@33
|
1294 int offset = noteOnMatrix[0][0];
|
andrew@33
|
1295 for (int i = 0;i < noteOnMatrix.size();i++){
|
andrew@33
|
1296 noteOnMatrix[i][0] -= offset;
|
andrew@33
|
1297 }
|
andrew@33
|
1298 }
|
andrew@33
|
1299
|
andrew@33
|
1300 }
|
andrew@33
|
1301
|
andrew@33
|
1302
|
andrew@33
|
1303 void midiEventHolder::printNoteCounter(){
|
andrew@33
|
1304 for (int i = 0;i < recordedTotalNoteCounterByPitch.size();i++){
|
andrew@33
|
1305 printf("RECORDED TOTAL[%i] := %i", i, recordedTotalNoteCounterByPitch[i]);
|
andrew@33
|
1306 }
|
andrew@34
|
1307 }
|
andrew@34
|
1308
|
andrew@34
|
1309 /* double timeDiff = 0;//timeDifference;
|
andrew@34
|
1310 if (runningInRealTime)
|
andrew@34
|
1311 timeDiff = ofGetElapsedTimeMillis() - lastSmoothUpdateTime;
|
andrew@34
|
1312 // bayesStruct.lastBestEstimateUpdateTime;
|
andrew@34
|
1313
|
andrew@34
|
1314 //smoothPlayPosition = bayesStruct.bestEstimate + 100;
|
andrew@34
|
1315 //relativeSpeedForSmooth = 0.1;
|
andrew@34
|
1316 //bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate);
|
andrew@34
|
1317 // speedEstimate*2;
|
andrew@34
|
1318
|
andrew@34
|
1319 smoothPlayPosition = storedSmoothPlayPosition + timeDiff * relativeSpeedForSmooth;// * bayesStruct.speedEstimate;
|
andrew@34
|
1320 storedSmoothPlayPosition = smoothPlayPosition;
|
andrew@34
|
1321 lastSmoothUpdateTime = getTimeNow(bayesStruct.lastBestEstimateUpdateTime);
|
andrew@34
|
1322 updateSmoothPlaySpeed();
|
andrew@34
|
1323 //bayesStruct.posterior.getIndexInRealTerms(bayesStruct.posterior.MAPestimate)
|
andrew@34
|
1324
|
andrew@34
|
1325 }
|
andrew@34
|
1326
|
andrew@34
|
1327 void midiEventHolder::updateSmoothPlaySpeed(){
|
andrew@34
|
1328 //project where current play pos will be in two seconds and aim for it.
|
andrew@34
|
1329 double timeToAimForMillis = 2000.0;
|
andrew@34
|
1330 //double timeDiff = ofGetElapsedTimeMillis() - bayesStruct.lastBestEstimateUpdateTime;//since the update need to get to where we are
|
andrew@34
|
1331 double projection = bayesStruct.bestEstimate + bayesStruct.speedEstimate*timeToAimForMillis;//
|
andrew@34
|
1332 double timeDifferenceFromSmooth = projection - smoothPlayPosition;
|
andrew@34
|
1333 relativeSpeedForSmooth = timeDifferenceFromSmooth / timeToAimForMillis;
|
andrew@34
|
1334
|
andrew@34
|
1335 }
|
andrew@34
|
1336 */
|
andrew@35
|
1337
|
andrew@35
|
1338
|
andrew@35
|
1339 /*
|
andrew@35
|
1340 void midiEventHolder::findLocalTempoPairsWeightedForConfidence(){
|
andrew@35
|
1341 bool needToUpdate = false;
|
andrew@35
|
1342
|
andrew@35
|
1343 //adapted this to just use the best match for each note
|
andrew@35
|
1344
|
andrew@35
|
1345 int currentPlayedIndex = playedNoteOnMatrix.size()-1;
|
andrew@35
|
1346 // printf("played %i : %i, vel %i\n", currentPlayedIndex, playedNoteOnMatrix[currentPlayedIndex][0], playedNoteOnMatrix[currentPlayedIndex][1]);
|
andrew@35
|
1347 // printMatchesFound();
|
andrew@35
|
1348 // printMatchMatrix();
|
andrew@35
|
1349 // printf("possible notes \n");
|
andrew@35
|
1350
|
andrew@35
|
1351 bayesStruct.setLikelihoodToConstant();
|
andrew@35
|
1352
|
andrew@35
|
1353 for (int i = 0;i < matchMatrix[currentPlayedIndex][0];i++){
|
andrew@35
|
1354
|
andrew@35
|
1355 //iterate through the recently matched events - even dodgy matches included
|
andrew@35
|
1356 //size, index of match0, index of match1, ....
|
andrew@35
|
1357 int recordedCurrentIndex = matchMatrix[currentPlayedIndex][i+1];
|
andrew@35
|
1358
|
andrew@35
|
1359 double currentMatchConfidence = matchConfidence[currentPlayedIndex][i+1];//new confidence
|
andrew@35
|
1360
|
andrew@35
|
1361 int previousIndex = currentPlayedIndex-1;
|
andrew@35
|
1362
|
andrew@35
|
1363 while (previousIndex >= 0 && playedEventTimes[previousIndex] + speedWindowWidthMillis > playedEventTimes[currentPlayedIndex]) {
|
andrew@35
|
1364 double playedTimeDifference = playedEventTimes[currentPlayedIndex] - playedEventTimes[previousIndex];
|
andrew@35
|
1365
|
andrew@35
|
1366 // for (int k = 0;k < matchMatrix[previousIndex][0];k++)
|
andrew@35
|
1367 int recordedPreviousIndex = bestMatchFound[previousIndex];//matchMatrix[previousIndex][k+1];
|
andrew@35
|
1368
|
andrew@35
|
1369 //double previousMatchConfidence = matchConfidence[previousIndex][k+1];
|
andrew@35
|
1370
|
andrew@35
|
1371
|
andrew@35
|
1372 double recordedTimeDifference = recordedEventTimes[recordedCurrentIndex] - recordedEventTimes[recordedPreviousIndex];
|
andrew@35
|
1373
|
andrew@35
|
1374
|
andrew@35
|
1375 //we want the speed of the recording relative to that of the playing live
|
andrew@35
|
1376
|
andrew@35
|
1377 double speedRatio = recordedTimeDifference / playedTimeDifference;
|
andrew@35
|
1378 if (speedRatio <= maximumMatchSpeed && speedRatio >= minimumMatchSpeed){
|
andrew@35
|
1379
|
andrew@35
|
1380 printf("(%i)", matchMatrix[currentPlayedIndex][i+1]);
|
andrew@35
|
1381 printf("[%i] :: ", recordedPreviousIndex);
|
andrew@35
|
1382 // printf(" conf %f & %f ", currentMatchConfidence, previousMatchConfidence);
|
andrew@35
|
1383 printf(" rec{%f} vs play(%f) ", recordedTimeDifference, playedTimeDifference);
|
andrew@35
|
1384 printf("update on speed ratio %f\n", speedRatio);
|
andrew@35
|
1385
|
andrew@35
|
1386 // matchString += " speed: "+ofToString(speedRatio, 3);
|
andrew@35
|
1387 // commented for debug
|
andrew@35
|
1388
|
andrew@35
|
1389
|
andrew@35
|
1390 double priorWeighting = 1;
|
andrew@35
|
1391
|
andrew@35
|
1392 if (useTempoPrior)
|
andrew@35
|
1393 priorWeighting = sin(speedRatio * PI/2);//adding in a prior that prefers 1.0 speed
|
andrew@35
|
1394
|
andrew@35
|
1395
|
andrew@35
|
1396 // double weighting = previousMatchConfidence * currentMatchConfidence ;
|
andrew@35
|
1397 double amount = (1-bayesStruct.speedLikelihoodNoise)*priorWeighting/10;
|
andrew@35
|
1398 bayesStruct.updateTempoLikelihood(speedRatio, amount);//second paramter is confidence in the match
|
andrew@35
|
1399 tempoSpeedString += ofToString(recordedPreviousIndex) + " " + ofToString(speedRatio, 2) + " "+ofToString(amount, 2) += " \n";
|
andrew@35
|
1400
|
andrew@35
|
1401 needToUpdate = true;
|
andrew@35
|
1402 }
|
andrew@35
|
1403 // printf("\n");
|
andrew@35
|
1404
|
andrew@35
|
1405
|
andrew@35
|
1406 previousIndex--;
|
andrew@35
|
1407 }//end while previousindex countdown
|
andrew@35
|
1408 }//end for loop through possible current matches
|
andrew@35
|
1409
|
andrew@35
|
1410 if (needToUpdate)
|
andrew@35
|
1411 bayesStruct.updateTempoDistribution();
|
andrew@35
|
1412 //printf("current speed is %f\n", bayesStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesStruct.relativeSpeedPosterior.MAPestimate));
|
andrew@35
|
1413 }
|
andrew@35
|
1414 */
|
andrew@35
|
1415
|
andrew@42
|
1416 /*
|
andrew@42
|
1417 JUNK SMOOTH StuffHex
|
andrew@42
|
1418 /*
|
andrew@42
|
1419 int testIndex = smoothIndex;
|
andrew@42
|
1420 while (testIndex >= 0 && abs(smoothLocation - myNotation.rwcAnnotations[testIndex].beatLocation) < range){
|
andrew@42
|
1421
|
andrew@42
|
1422 if (myNotation.rwcAnnotations[testIndex].midiNote == currentNote){
|
andrew@42
|
1423 if (abs(myNotation.rwcAnnotations[testIndex].beatLocation - smoothLocation) < currentLocationDifference){
|
andrew@42
|
1424 currentLocationDifference = abs(myNotation.rwcAnnotations[testIndex].beatLocation - smoothLocation);
|
andrew@42
|
1425 difference = playingTime - (myNotation.rwcAnnotations[testIndex].eventTime*1000.0);
|
andrew@42
|
1426 annotationNote = myNotation.rwcAnnotations[testIndex].midiNote;
|
andrew@42
|
1427 annotationLocation = myNotation.rwcAnnotations[testIndex].beatLocation;
|
andrew@42
|
1428 annotationTime = myNotation.rwcAnnotations[testIndex].eventTime;
|
andrew@42
|
1429 }
|
andrew@42
|
1430 }
|
andrew@42
|
1431 testIndex--;
|
andrew@42
|
1432 }
|
andrew@42
|
1433
|
andrew@42
|
1434 testIndex = smoothIndex;
|
andrew@42
|
1435 while (testIndex >= 0 && testIndex < myNotation.rwcAnnotations.size() && abs(smoothLocation - myNotation.rwcAnnotations[testIndex].beatLocation) < range){
|
andrew@42
|
1436
|
andrew@42
|
1437 if (myNotation.rwcAnnotations[testIndex].midiNote == currentNote){
|
andrew@42
|
1438 if (abs(myNotation.rwcAnnotations[testIndex].beatLocation - smoothLocation) < currentLocationDifference){
|
andrew@42
|
1439 currentLocationDifference = abs(myNotation.rwcAnnotations[testIndex].beatLocation - smoothLocation);
|
andrew@42
|
1440 difference = playingTime - (myNotation.rwcAnnotations[testIndex].eventTime*1000.0);
|
andrew@42
|
1441 annotationNote = myNotation.rwcAnnotations[testIndex].midiNote;
|
andrew@42
|
1442 annotationLocation = myNotation.rwcAnnotations[testIndex].beatLocation;
|
andrew@42
|
1443 annotationTime = myNotation.rwcAnnotations[testIndex].eventTime;
|
andrew@42
|
1444 }
|
andrew@42
|
1445 }
|
andrew@42
|
1446 testIndex++;
|
andrew@42
|
1447 }
|
andrew@42
|
1448 */
|