comparison src/AudioEventMatcher.h @ 37:9806a4f22fd0

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
comparison
equal deleted inserted replaced
36:eb43b2a007ea 37:9806a4f22fd0
41 void drawPositionWindow(); 41 void drawPositionWindow();
42 void drawTrackLikelihoods(); 42 void drawTrackLikelihoods();
43 void drawInfo(); 43 void drawInfo();
44 44
45 void setWindowDimensions(); 45 void setWindowDimensions();
46 int getScreenWidthIndexOfEventTime(const double& time);
46 47
47 void newPitchEvent(const int& channel, const double& pitchIn, const double& timeIn); 48 void newPitchEvent(const int& channel, const double& pitchIn, const double& timeIn);
48 void newKickEvent(const double& timeIn); 49 void newKickEvent(const double& timeIn);
49 void newKickEvent(const int& channel, const double& timeIn); 50 void newKickEvent(const int& channel, const double& timeIn);
50 void newSnareEvent(const double& timeIn); 51 void newSnareEvent(const double& timeIn);
80 void startPlaying(); 81 void startPlaying();
81 void stopPlaying(); 82 void stopPlaying();
82 bool startedPlaying; 83 bool startedPlaying;
83 84
84 bool usingRealTime; 85 bool usingRealTime;
85 double recentPitch, recentTime; 86 double recentPitch, recentPitchEventTime;
86 87
87 DynamicVector likelihoodVisualisation[numberOfChannels]; 88 DynamicVector likelihoodVisualisation[numberOfChannels];
88 DynamicVector recentPriors[numberOfChannels]; 89 DynamicVector recentPriors[numberOfChannels];
89 //DynamicVector recentPrior; 90 //DynamicVector recentPrior;
90 DynamicVector projectedPrior; 91 DynamicVector projectedPrior;
124 void updateRecordedTempo(); 125 void updateRecordedTempo();
125 void drawRecordedTempo(); 126 void drawRecordedTempo();
126 double currentSpeedRatio; 127 double currentSpeedRatio;
127 void drawPlayingTempo(); 128 void drawPlayingTempo();
128 void setSpeedRatioDistribution(const double& speedRatio); 129 void setSpeedRatioDistribution(const double& speedRatio);
130
131 double euclideanMaximumDistance;
132 bool printingData;
129 }; 133 };
130 #endif 134 #endif