comparison src/AudioEventMatcher.cpp @ 17:c96b18dd0f48

adjusting sync parameters

 const int matchWindowWidth = 6000;
 
 AudioEventMatcher::AudioEventMatcher(){
 
 	
-	pitchLikelihoodToNoise = 0.9;//more noise
-	
-	onsetLikelihoodToNoise = 0.4;
-	onsetLikelihoodWidth = 20;//in ms
+	pitchLikelihoodToNoise = 0.7;//more noise
+	
+	onsetLikelihoodToNoise = 0.5;
+	onsetLikelihoodWidth = 10;//in ms
 	
 	setArraySizes();
 	
 	usingRealTime = false;
 	bayesianStruct.realTimeMode = &usingRealTime;

 	currentAlignmentPosition = 0;
 	startTime = ofGetElapsedTimeMillis();
 	
 	projectedPrior = bayesianStruct.prior;
 	startedPlaying = true;
+	synchroniser.reset();
+	
 	//bayesianStruct.posterior.printArray();
 }
 
 
 void AudioEventMatcher::stopPlaying(){

 //	currentAlignmentTime = newTime;
 	currentAlignmentPosition = bayesianStruct.posterior.getIndexInRealTerms(bayesianStruct.posterior.MAPestimate);
 	currentAlignmentPosition += (newTime - lastAlignmentTime) * bayesianStruct.relativeSpeedPosterior.getIndexInRealTerms(bayesianStruct.relativeSpeedPosterior.MAPestimate);
 
 	
-	synchroniser.updateRecordedPosition(currentAlignmentPosition);
+	synchroniser.updateRecordedPosition(currentAlignmentPosition, newTime);
 	
 	synchroniser.updateOutputSpeed();
 	
 	bayesianStruct.projectDistribution(newTime, currentAlignmentPosition, projectedPrior);//prior gets updated to where we are now
 	

 	
 	ofDrawBitmapString("pitch "+ofToString(recentPitch, 2)+", Time "+ofToString(recentTime, 0), 20, 20);
 	
 	string alignString = " align "+ofToString(currentAlignmentPosition, 2);
 	alignString += " playing "+ofToString(synchroniser.playingPositionRatio, 5);
-	alignString += "  "+ofToString(synchroniser.playingPositionMillis)+" ms";
+	alignString += "  pos "+ofToString(synchroniser.playingPositionMillis,0)+" ms";
+	alignString +=  "  rec pos "+ofToString(synchroniser.recordedPositionMillis,0)+" ms";
 	ofDrawBitmapString(alignString, 20, 50);
 	
 	ofDrawBitmapString("pos "+ofToString(recordedTracks.loadedAudioFiles[0].fileLoader.onsetDetect.playPosition), 200,600);
 }