comparison plugins/BarBeatTrack.cpp @ 148:88c05c0ac438

Edit some descriptions; don't expose tightness parameter, only alpha (on advice from MEPD)
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 02 Sep 2013 11:50:04 +0100
parents edad8a88a074
children c45f74550f38
comparison
equal deleted inserted replaced
147:d169df0c0cbc 148:88c05c0ac438
140 desc.defaultValue = 0.90; 140 desc.defaultValue = 0.90;
141 desc.unit = ""; 141 desc.unit = "";
142 desc.isQuantized = false; 142 desc.isQuantized = false;
143 list.push_back(desc); 143 list.push_back(desc);
144 144
145 145 // We aren't exposing tightness as a parameter, it's fixed at 4
146 // changes are as per the BeatTrack.cpp
147 //Tightness Parameter of Beat Tracker
148 desc.identifier = "tightness";
149 desc.name = "Tightness";
150 desc.description = "Inertia - Flexibility Trade Off 2";
151 desc.minValue = 3;
152 desc.maxValue = 7;
153 desc.defaultValue = 4;
154 desc.unit = "";
155 desc.isQuantized = true;
156 list.push_back(desc);
157 146
158 // changes are as per the BeatTrack.cpp 147 // changes are as per the BeatTrack.cpp
159 //User input tempo 148 //User input tempo
160 desc.identifier = "inputtempo"; 149 desc.identifier = "inputtempo";
161 desc.name = "InputTempo"; 150 desc.name = "Tempo Hint";
162 desc.description = "User defined Tempo"; 151 desc.description = "User-defined tempo on which to centre the probability distribution";
163 desc.minValue = 50; 152 desc.minValue = 50;
164 desc.maxValue = 250; 153 desc.maxValue = 250;
165 desc.defaultValue = 120; 154 desc.defaultValue = 120;
166 desc.unit = "BPM"; 155 desc.unit = "BPM";
167 desc.isQuantized = true; 156 desc.isQuantized = true;
168 list.push_back(desc); 157 list.push_back(desc);
169 158
170 // changes are as per the BeatTrack.cpp 159 // changes are as per the BeatTrack.cpp
171 desc.identifier = "constraintempo"; 160 desc.identifier = "constraintempo";
172 desc.name = "Constrain Tempo"; 161 desc.name = "Constrain Tempo";
173 desc.description = "Constrain tempo to use Gaussian weighting"; 162 desc.description = "Constrain more tightly around the tempo hint, using a Gaussian weighting instead of Rayleigh";
174 desc.minValue = 0; 163 desc.minValue = 0;
175 desc.maxValue = 1; 164 desc.maxValue = 1;
176 desc.defaultValue = 0; 165 desc.defaultValue = 0;
177 desc.isQuantized = true; 166 desc.isQuantized = true;
178 desc.quantizeStep = 1; 167 desc.quantizeStep = 1;
189 { 178 {
190 if (name == "bpb") { 179 if (name == "bpb") {
191 return m_bpb; 180 return m_bpb;
192 } else if (name == "alpha") { 181 } else if (name == "alpha") {
193 return m_alpha; 182 return m_alpha;
194 } else if (name == "tightness") {
195 return m_tightness;
196 } else if (name == "inputtempo") { 183 } else if (name == "inputtempo") {
197 return m_inputtempo; 184 return m_inputtempo;
198 } else if (name == "constraintempo") { 185 } else if (name == "constraintempo") {
199 return m_constraintempo ? 1.0 : 0.0; 186 return m_constraintempo ? 1.0 : 0.0;
200 } 187 }
206 { 193 {
207 if (name == "bpb") { 194 if (name == "bpb") {
208 m_bpb = lrintf(value); 195 m_bpb = lrintf(value);
209 } else if (name == "alpha") { 196 } else if (name == "alpha") {
210 m_alpha = value; 197 m_alpha = value;
211 } else if (name == "tightness") {
212 m_tightness = value;
213 } else if (name == "inputtempo") { 198 } else if (name == "inputtempo") {
214 m_inputtempo = value; 199 m_inputtempo = value;
215 } else if (name == "constraintempo") { 200 } else if (name == "constraintempo") {
216 m_constraintempo = (value > 0.5); 201 m_constraintempo = (value > 0.5);
217 } 202 }