comparison src/AudioEventMatcher.cpp @ 19:1a62561bd72d

Added in tempo follower class that models the tempo of played events

 
 
 	
 	followingLiveInput = true;
 	startedPlaying = false;
-}
+	
+	temporal.setUpEventTimeMatrix();
+}
+
+
 
 
 void AudioEventMatcher::setWindowDimensions(){
 	double startHeight = recordedTracks.numberOfAudioTracks * recordedTracks.trackScreenHeight;
 	double heightAvailable = 1 - startHeight;
-	heightAvailable /= 3.0;
+	heightAvailable /= NUMBER_OF_CHANNELS;
 	
 	bayesPositionWindow.setToRelativeSize(0, startHeight, 1, heightAvailable);
 	bayesLikelihoodWindow.setToRelativeSize(0, startHeight + 1*heightAvailable, 1, heightAvailable);
 	bayesTempoWindow.setToRelativeSize(0, startHeight + 2*heightAvailable, 1, heightAvailable);
 	

 	startTime = ofGetElapsedTimeMillis();
 	
 	projectedPrior = bayesianStruct.prior;
 	startedPlaying = true;
 	synchroniser.reset();
+	temporal.reset();
 	
 	//bayesianStruct.posterior.printArray();
 }
 
 
 void AudioEventMatcher::stopPlaying(){
 	startedPlaying = false;
+	temporal.printEventTimes();
 }
 
 void AudioEventMatcher::updatePosition(){
+	
+	if (startedPlaying){
 	if (!followingLiveInput)
 		recordedTracks.updatePosition();
-	else if (startedPlaying)
+	else
 		recordedTracks.updatePositionToMillis(currentAlignmentPosition);
 		
 	updateBestAlignmentPosition();
+	}
+	
+	temporal.tempoPosterior.addGaussianShape(temporal.tempoPosterior.MAPestimate, temporal.tempoArraySize / 4, 0.5	);
 }
 
 void AudioEventMatcher::updateBestAlignmentPosition(){
 	//THIS DEALS WITH WHERE WE ARE NOW! ON THE SCREEN
 	//DIFFERENT TO WHEN EVENTS COME IN AS THEY ARE TIMESTAMPED - SO EG A PITCH EVENT MAY ARRIVE 16 CHROMA FRAMES LATER - BIG DIFFERENCE

 	bayesianStruct.prior.drawConstrainedVector(bayesianStruct.prior.getRealTermsAsIndex(screenStartTimeMillis), bayesianStruct.prior.getRealTermsAsIndex(screenEndTimeMillis), 0, ofGetWidth(), bayesPositionWindow);
 	
 	ofSetColor(255,0,0);
 	projectedPrior.drawConstrainedVector(bayesianStruct.prior.getRealTermsAsIndex(screenStartTimeMillis), bayesianStruct.prior.getRealTermsAsIndex(screenEndTimeMillis), 0, ofGetWidth(), bayesPositionWindow);
 	
+	temporal.drawTempoArray(bayesLikelihoodWindow);
+	
 }
 
 void AudioEventMatcher::newPitchEvent(const int& channel, const double& pitchIn, const double& timeIn){
 	if (pitchIn > 0){
 	liveInput.addPitchEvent(pitchIn, timeIn);

 	lastAlignmentTime = timeIn;//use TIMESTAMP
 	recentEventTime[channel] = timeIn;//ofGetElapsedTimeMillis() - startTime;
 
 	recentPriors[channel] = bayesianStruct.prior;
 	projectedPrior = bayesianStruct.prior;
+	
+	
+	temporal.updateTempo(channel, timeIn);
 	}
 	
 
 	
 }

 		lastAlignmentTime = timeIn;//has to use the STAMPED time
 		recentEventTime[channel] = timeIn;
 		
 		recentPriors[channel] = bayesianStruct.prior;
 		projectedPrior = bayesianStruct.prior;
+		
+		temporal.eventTimes[channel].push_back(timeIn);
 	}
 	
 
 }