Mercurial > hg > multitrack-audio-matcher

comparison 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
comparison
equal deleted inserted replaced
55:2eca10a31ae2 56:4394c9490716
122 122
123 AccompanimentSynchroniser synchroniser; 123 AccompanimentSynchroniser synchroniser;
124 124
125 //params 125 //params
126 double onsetLikelihoodWidth; 126 double onsetLikelihoodWidth;
127 double onsetLikelihoodToNoise; 127 double pitchLikelihoodWidth;
128 //double onsetLikelihoodToNoise;
128 double kickLikelihoodToNoise, snareLikelihoodToNoise; 129 double kickLikelihoodToNoise, snareLikelihoodToNoise;
129 double pitchLikelihoodToNoise;//more noise 130 double pitchLikelihoodToNoise;//more noise
130 double chromaLikelihoodToNoise; 131 double chromaLikelihoodToNoise;
131 132
132 double pitchOfNearestMatch;//for viz purposes 133 double pitchOfNearestMatch;//for viz purposes
135 double chromaLikelihoodWidth; 136 double chromaLikelihoodWidth;
136 137
137 TempoFollower temporal; 138 TempoFollower temporal;
138 TempoFollower recordedTempoData; 139 TempoFollower recordedTempoData;
139 void calculateRecordedTempoData(); 140 void calculateRecordedTempoData();
141
140 void setTempoPrior(double tempo); 142 void setTempoPrior(double tempo);
141 143
142 void setNextOnsetTime(const int&channel, int& time, int* indexForOnsets); 144 void setNextOnsetTime(const int&channel, int& time, int* indexForOnsets);
143 int recordedTempoIndex; 145 int recordedTempoIndex;
144 double recordedTempo; 146 double recordedTempo;
145 void updateRecordedTempo(); 147 void updateRecordedTempo();
148 double getRecordedTempoAtMillis(const double& millisPosition);
149
146 void drawRecordedTempo(); 150 void drawRecordedTempo();
147 double currentSpeedRatio; 151 double currentSpeedRatio;
148 void drawPlayingTempo(); 152 void drawPlayingTempo();
149 void setSpeedRatioDistribution(const double& speedRatio); 153 void setSpeedRatioDistribution(const double& speedRatio);
150 154
165 void writeKickEvent(const int& startMatchingTime, const int& endMatchingTime, std::string filepath); 169 void writeKickEvent(const int& startMatchingTime, const int& endMatchingTime, std::string filepath);
166 ofImage img; 170 ofImage img;
167 171
168 void checkTempo(); 172 void checkTempo();
169 double relativeTempo; 173 double relativeTempo;
174
175 bool updateTempoMethodOn;
170 }; 176 };
171 #endif 177 #endif