Mercurial > hg > multitrack-audio-matcher

diff src/AudioEventMatcher.h @ 56:4394c9490716 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor changes
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Mon, 24 Dec 2012 18:58:39 +0000
parents 2eca10a31ae2
children
line wrap: on
line diff
--- a/src/AudioEventMatcher.h	Mon Dec 10 17:07:21 2012 +0000
+++ b/src/AudioEventMatcher.h	Mon Dec 24 18:58:39 2012 +0000
@@ -124,7 +124,8 @@
 	
 	//params
 	double onsetLikelihoodWidth;
-	double onsetLikelihoodToNoise;
+	double pitchLikelihoodWidth;
+	//double onsetLikelihoodToNoise;
 	double kickLikelihoodToNoise, snareLikelihoodToNoise;
 	double pitchLikelihoodToNoise;//more noise
 	double chromaLikelihoodToNoise;
@@ -137,12 +138,15 @@
 	TempoFollower temporal;
 	TempoFollower recordedTempoData;
 	void calculateRecordedTempoData();
+
 	void setTempoPrior(double tempo);
 	
 	void setNextOnsetTime(const int&channel, int& time, int* indexForOnsets);
 	int recordedTempoIndex;
 	double recordedTempo;
 	void updateRecordedTempo();
+	double getRecordedTempoAtMillis(const double& millisPosition);
+	
 	void drawRecordedTempo();
 	double currentSpeedRatio;
 	void drawPlayingTempo();
@@ -167,5 +171,7 @@
 	
 	void checkTempo();
 	double relativeTempo;
+	
+	bool updateTempoMethodOn;
 };
 #endif