Mercurial > hg > multitrack-audio-matcher

diff src/AudioEventMatcher.h @ 37:9806a4f22fd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bugs in the likelohoods that caused some to zero when no events found.
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Tue, 24 Apr 2012 14:16:01 +0100
parents 6fb77b20413c
children d23685b9e766
line wrap: on
line diff
--- a/src/AudioEventMatcher.h	Tue Apr 24 01:19:24 2012 +0100
+++ b/src/AudioEventMatcher.h	Tue Apr 24 14:16:01 2012 +0100
@@ -43,6 +43,7 @@
 	void drawInfo();
 	
 	void setWindowDimensions();
+	int getScreenWidthIndexOfEventTime(const double& time);
 	
 	void newPitchEvent(const int& channel, const double& pitchIn, const double& timeIn);
 	void newKickEvent(const double& timeIn);
@@ -82,7 +83,7 @@
 	bool startedPlaying;
 	
 	bool usingRealTime;
-	double recentPitch, recentTime;
+	double recentPitch, recentPitchEventTime;
 	
 	DynamicVector likelihoodVisualisation[numberOfChannels];
 	DynamicVector recentPriors[numberOfChannels];
@@ -126,5 +127,8 @@
 	double currentSpeedRatio;
 	void drawPlayingTempo();
 	void setSpeedRatioDistribution(const double& speedRatio);
+	
+	double euclideanMaximumDistance;
+	bool printingData;
 };
 #endif