comparison src/AudioEventMatcher.cpp @ 39:f5de07b4d733

helped the tempo prior to have wider shape

  */
 
 #include "AudioEventMatcher.h"
 
 
-const int matchWindowWidth = 8000;
+const int matchWindowWidth = 8000;//ms in which to match
+
 const float pitchCutOff = 16;//within which pitches are even considered
 
 AudioEventMatcher::AudioEventMatcher(){
 
 	useChromaDotProduct = false;

 	currentAlignmentPosition = 0;
 
 	followingLiveInput = true;
 	startedPlaying = false;
 	recordedTempoIndex = 0;
+	
+	bayesianStruct.startingWindowWidth = matchWindowWidth / 4;
 //	temporal.setUpEventTimeMatrix();
 //	recordedTempoData.setUpEventTimeMatrix();
 }
 
 

 	//bayesianStruct.posterior.printArray();
 }
 
 
 void AudioEventMatcher::setSpeedRatioDistribution(const double& speedRatio){
+	//here is the speed combo actually used
 	bayesianStruct.relativeSpeedPosterior.zero();
-	bayesianStruct.relativeSpeedPosterior.addToIndex(bayesianStruct.relativeSpeedPosterior.getRealTermsAsIndex(speedRatio), 1);
-	bayesianStruct.relativeSpeedPosterior.addGaussianShapeFromRealTime(1, 0.06, 0.8);
+//	bayesianStruct.relativeSpeedPosterior.addToIndex(bayesianStruct.relativeSpeedPosterior.getRealTermsAsIndex(speedRatio), 1);
+	bayesianStruct.relativeSpeedPosterior.addGaussianShapeFromRealTime(1, 0.1, 3);
+	bayesianStruct.relativeSpeedPosterior.addGaussianShapeFromRealTime(1, 0.02, 2);
 }
 
 void AudioEventMatcher::stopPlaying(){
 	startedPlaying = false;
 	//temporal.printEventTimes();

 
 	//MAIN DRAW FUNCTION FOR ALL
 	
 	//draw some outlines in blue
 	ofSetColor(20,200,200);
-	bayesPositionWindow.drawOutline();
-	bayesTempoWindow.drawOutline();
+//	bayesPositionWindow.drawOutline();
+//	bayesTempoWindow.drawOutline();
 	
 	//draw the scrolling audio tracks
 	recordedTracks.drawTracks();
 
 	ofSetColor(255);

 	tmpStr += " Nearest "+ofToString(pitchOfNearestMatch,2);
 	tmpStr += " dist "+ofToString(distanceOfNearestMatch, 2);
 	tmpStr +=  ", Time "+ofToString(recentPitchEventTime, 0);
 	ofDrawBitmapString(tmpStr, 20, 20);
 	
-	string alignString = " align "+ofToString(currentAlignmentPosition, 2);
+	string alignString = "align "+ofToString(currentAlignmentPosition, 2);//same as synchroniser-recordedposition
 	alignString += " playing "+ofToString(synchroniser.playingPositionRatio, 5);
-	alignString += "  pos "+ofToString(synchroniser.playingPositionMillis,0)+" ms";
-	alignString +=  "  rec pos "+ofToString(synchroniser.recordedPositionMillis,0)+" ms";
+	alignString += "  pos "+ofToString(synchroniser.playingPositionMillis,0)+" ms";//playing position in file - causal correction 
+	alignString +=  "  rec pos "+ofToString(synchroniser.recordedPositionMillis,0)+" ms";//currentAlignmentPosition in rehearsal
+	alignString += "playing time "+ofToString(synchroniser.recordedPositionTimeSent, 0)+" ms";//playing time since begining of live take
 	ofDrawBitmapString(alignString, 20, 50);
-	
 	ofDrawBitmapString("pos "+ofToString(recordedTracks.loadedAudioFiles[0].fileLoader.onsetDetect.playPosition), 200,600);
 	
 }
 
 void AudioEventMatcher::newPitchEvent(const int& channel, const double& pitchIn, const double& timeIn){