comparison src/midiEventHolder.cpp @ 5:195907bb8bb7

added purple where notes have been seen - lets you see what updates have been used. Also the chopping of midi files to the beginning was introduced recently, so when they load, you chop any white space at the beginning, then use first note to launch.

 	bayesStruct.posterior.offset = 0;
 	
 	playedEventTimes.clear();
 	playedNoteOnMatrix.clear();
 	matchMatrix.clear();
+	bestMatchIndex = 0;
 	
 	bayesStruct.resetSpeedToOne();
 	bayesStruct.setSpeedPrior(speedPriorValue);
-	
+	setMatchedNotesBackToFalse();
+}
+
+void midiEventHolder::setMatchedNotesBackToFalse(){
+	for (int i = 0;i < noteOnMatches.size();i++)
+		noteOnMatches[i] = false;
 }
 
 void midiEventHolder::clearAllEvents(){
 	recordedNoteOnMatrix.clear();
 	matchesFound.clear();

 		
 	matchString = "";
 	
 	windowStartTime = max(0.0,(bayesStruct.bestEstimate - matchWindowWidth/2));//was playPositionInMillis
 	int numberOfMatches = findMatch(notePitch, windowStartTime, windowStartTime + matchWindowWidth);
+
 	
 	matchString += " pitch: "+ofToString(notePitch)+" matches "+ofToString(numberOfMatches)+" win start "+ofToString(windowStartTime);	
 	
 	return numberOfMatches;
 	

 		while (startIndex < recordedEventTimes.size() && recordedEventTimes[startIndex] < startTime)
 			startIndex++;
 		   
 		}
 
-	
+	double minimumConfidence = 0;
 	while (startIndex < recordedEventTimes.size() && recordedEventTimes[startIndex] < endTime){
 		if (recordedNoteOnMatrix[startIndex][1] == notePitch){
 			matchesFound.push_back(startIndex);
+			double eventConfidence = bayesStruct.posterior.getValueAtMillis(recordedEventTimes[startIndex]);
+				if (eventConfidence > minimumConfidence){
+					minimumConfidence = eventConfidence;
+					bestMatchIndex = startIndex;
+				}
+			
 			double confidence = bayesStruct.posterior.getValueAtMillis(mouseX);
 	//																   recordedEventTimes[startIndex]);
 			matchString += "["+ofToString(startIndex)+"] = "+ofToString(confidence, 3)+" .";
 		}
 		startIndex++;
 	}
-	 
+	
+
 //	printf("%i MATCHES TO Note %i found\n", (int)matchesFound.size(), notePitch);
 	int size = matchesFound.size();
-
+		if (size > 0)
+		noteOnMatches[bestMatchIndex] = true;
+	
 	IntVector v;
 	v.push_back(size);
 	for (int i = 0;i < matchesFound.size();i++)
 		v.push_back(matchesFound[i]);
 	

 		
 		for (int tmpIndex = max(0,minNoteIndexToPrint);tmpIndex < min(maxNoteIndexToPrint, (int)recordedNoteOnMatrix.size());tmpIndex++){
 			
 			if (checkIfMatchedNote(tmpIndex))
 				ofSetColor(0,0,255);
-			else
+			else if(noteOnMatches[tmpIndex]){
+			ofSetColor(255,0,255);
+			}else{
 				ofSetColor(255,255,255);
+			}
+		
+			
 
 	//		 XXX replace ofgetwidth below
 			//if (tmpIndex >= 0 && tmpIndex < size)
 			int xLocation = (float)(recordedNoteOnMatrix[tmpIndex][0] - numberOfScreensIn*ticksPerScreen)*(*screenWidth)/(float)ticksPerScreen;
 			int duration = (float)(recordedNoteOnMatrix[tmpIndex][3]*(*screenWidth))/(float)ticksPerScreen;