comparison src/AudioEventMatcher.cpp @ 15:780def3a1f36

Changed to have any definition - re midi matcher bug fix - and bringing in start and stop functions

 
 const int matchWindowWidth = 6000;
 
 AudioEventMatcher::AudioEventMatcher(){
 
+	
+	pitchLikelihoodToNoise = 0.4;//more noise
+	onsetLikelihoodToNoise = 0.3;
+	onsetLikelihoodWidth = 20;//in ms
+	
 	setArraySizes();
 	
 	usingRealTime = false;
 	bayesianStruct.realTimeMode = &usingRealTime;
 	recentPitch = 0;
 	currentAlignmentPosition = 0;
 
-	onsetLikelihoodWidth = 20;
+
 	
 	followingLiveInput = true;
+	startedPlaying = false;
 }
 
 
 void AudioEventMatcher::setWindowDimensions(){
 	double startHeight = recordedTracks.numberOfAudioTracks * recordedTracks.trackScreenHeight;

 	bayesianStruct.setStartPlaying();
 	currentAlignmentPosition = 0;
 	startTime = ofGetElapsedTimeMillis();
 	
 	projectedPrior = bayesianStruct.prior;
+	startedPlaying = true;
 	//bayesianStruct.posterior.printArray();
 }
 
+
+void AudioEventMatcher::stopPlaying(){
+	startedPlaying = false;
+}
 
 void AudioEventMatcher::updatePosition(){
 	if (!followingLiveInput)
 		recordedTracks.updatePosition();
-	else
+	else if (startedPlaying)
 		recordedTracks.updatePositionToMillis(currentAlignmentPosition);
 		
 	updateBestAlignmentPosition();
 }
 

 void AudioEventMatcher::matchNewOnsetEvent(const int& channel, const double& timeIn){
 
 	bayesianStruct.updateBayesianDistributions(timeIn);//moves the posterior up into prior given the time interval and calculates new offsets
 
 	//start at beginning but OPTIMISE later
-	double onsetLikelihoodToNoise = 0.3;
+	
 	
 	bayesianStruct.likelihood.offset = bayesianStruct.prior.offset;
 	bayesianStruct.likelihood.zero();//set to zero
 	
 	double quantity = 1;//likelihoodToNoiseRatio / numberOfMatches;

 	*/
 	bayesianStruct.updateBayesianDistributions(timeIn);//moves the posterior up into prior given the time interval and calculates new offsets
 
 	//set the lielihoods by matching the pitched note
 	
-	double pitchLikelihoodToNoise = 0.7;//more noise
+	
 	int numberOfMatches = 0;
 	bayesianStruct.likelihood.zero();//set to zero
 	
 	double quantity = 0;
 	if (channel <= recordedTracks.numberOfAudioTracks){