comparison src/midiEventHolder.cpp @ 14:3f103cf78148

Checking to allow offline version

 	
 	bayesStruct.speedLikelihoodNoise = 0.1;//was 0.05
 	bayesStruct.speedDecayWidth = 20;
 	bayesStruct.speedDecayAmount = 10;
 	
+	runningInRealTime = true;
+	
 	speedPriorValue = 1.0;
 	
 	matchWindowWidth = 8000;//window size for matching in ms 
 	
 	bayesStruct.resetSize(matchWindowWidth);

 void midiEventHolder::reset(){
 	//called when we start playing
 	
 	noteArrayIndex = 0;
 	tickLocation = 0;
-	lastPeriodUpdateTime = ofGetElapsedTimeMillis();
-	bayesStruct.lastEventTime = ofGetElapsedTimeMillis();
+	lastPeriodUpdateTime = getTimeNow(0);//ofGetElapsedTimeMillis();
+	bayesStruct.lastEventTime = getTimeNow(0);//ofGetElapsedTimeMillis();
 	numberOfScreensIn = 0;
 //	recordedNoteOnIndex = 0;
 	bayesStruct.setNewDistributionOffsets(0);
 	bayesStruct.posterior.offset = 0;
 	

 	playedNoteOnMatrix.clear();
 	matchMatrix.clear();
 }
 
 void midiEventHolder::printNotes(){
-	printf("RECORDED MATRIX");
+	printf("RECORDED MATRIX\n");
 	for (int i = 0;i < recordedNoteOnMatrix.size();i++){
-		printf("%i :: %i @ %f\n", recordedNoteOnMatrix[i][0], recordedNoteOnMatrix[i][1], recordedEventTimes[i]);
+		printf("ticktime %i :: pitch %i @ millis %f\n", recordedNoteOnMatrix[i][0], recordedNoteOnMatrix[i][1], recordedEventTimes[i]);
 	}
 }
 
 
 double midiEventHolder::getEventTimeTicks(double millis){

 	bayesStruct.addGaussianNoiseToSpeedPosterior(timeDifference * 10 / 100.);
 //	bayesStruct.addTriangularNoiseToSpeedPosterior(timeDifference * 10 / 100.);
 	}
 	
 	bayesStruct.updateTmpBestEstimate(timeDifference);// debug - didnt work	bayesStruct.bestEstimate = bayesStruct.tmpBestEstimate;
-	bayesStruct.updateBestEstimate();
-	bayesStruct.lastBestEstimateUpdateTime = ofGetElapsedTimeMillis();
+	bayesStruct.updateBestEstimate(timeDifference);
+	bayesStruct.lastBestEstimateUpdateTime = getTimeNow(timePlayed);
 	
 //	double newMAPestimateTime = bayesStruct.posterior.getIndexInRealTerms(bayesStruct.posterior.MAPestimate);
 	//was offset + bayesStruct.posterior.MAPestimate; but this doesnt include scalar to convert to millis
 
 	timeString = "Pitch:"+ofToString(pitch);

 	
 	//bayesStruct.addGaussianNoiseToSpeedPosterior(10);
 	 
 }
 
+double midiEventHolder::getTimeNow(double eventTime){
+	double timeNow = eventTime;
+	if (runningInRealTime)
+		timeNow = ofGetElapsedTimeMillis();
+	return timeNow;
+}
+
 int midiEventHolder::findLocalMatches(int notePitch){
 
 	//here we find the matches to the new note within appropriate range
 		
 	matchString = "";

 	//}
 	 
 	
 	matchMatrix.push_back(v);
 	matchConfidence.push_back(d);
+	
+	printf("BEST MATCH TO note %i,time %i is recorded time %i, confidence %0.2f\n", notePitch, startTime, (int) recordedEventTimes[bestMatchIndex], minimumConfidence);
 	
 	return size;
 }
 
 bool midiEventHolder::checkIfMatchedNote(const int& tmpIndex){

 void midiEventHolder::updatePlayPosition(){
 	
 	//in actual fact if we are changing the speed of the play position 
 	//we will need to update this via the file
 	
-	double timeDifference = ofGetElapsedTimeMillis() - lastPeriodUpdateTime;
+	//actually time since beginning of file i think
+	
+	double timeDifference = ofGetElapsedTimeMillis() - lastPeriodUpdateTime;//elpased - lastperiodupdatetime
 	//this is time diff in milliseconds
 	//then we have 
 	double quarterNoteIntervals = (timeDifference / period);
 	tickLocation = quarterNoteIntervals * pulsesPerQuarternote; 
 	
 	playPositionInMillis = timeDifference;//based on updating from when we change period
 	//this to be added
 	
-	bayesStruct.updateBestEstimate();
+	if (runningInRealTime)
+	bayesStruct.updateBestEstimate(timeDifference);
 	
 }
 
 
 void midiEventHolder::drawMidiFile(){

 				ofSetColor(255,0,255);
 			}else{
 				ofSetColor(255,255,255);
 			}
 			
-			
+			if (tmpIndex == bestMatchIndex)
+				ofSetColor(255,0,0);//best recent match is in red
 			
 			//		 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;

 	
 }
 
 
 void midiEventHolder::setStartPlayingTimes(){
-	lastPeriodUpdateTime = ofGetElapsedTimeMillis();
+	lastPeriodUpdateTime = getTimeNow(0);//ofGetElapsedTimeMillis();
 	startTime = lastPeriodUpdateTime;
 	
 /*	
  	bayesStruct.lastEventTime = 0;//ofGetElapsedTimeMillis();
 	bayesStruct.bestEstimate = 0;