-#include <ardour/transient_detector.h>
+#include <cmath>
+
+#include "ardour/readable.h"
+#include "ardour/transient_detector.h"
#include "i18n.h"
/* need a static initializer function for this */
-string TransientDetector::_op_id = X_("libardourvampplugins:percussiononsets:2");
+string TransientDetector::_op_id = X_("libardourvampplugins:qm-onsetdetector:2");
TransientDetector::TransientDetector (float sr)
- : AudioAnalyser (sr, X_("libardourvampplugins:percussiononsets"))
+ : AudioAnalyser (sr, X_("libardourvampplugins:qm-onsetdetector"))
{
/* update the op_id */
- _op_id = X_("libardourvampplugins:percussiononsets");
-
+ _op_id = X_("libardourvampplugins:qm-onsetdetector");
+
// XXX this should load the above-named plugin and get the current version
-
+
_op_id += ":2";
+
+ threshold = 0.00;
}
TransientDetector::~TransientDetector()
int ret = analyse (path, src, channel);
current_results = 0;
+
return ret;
}
const Plugin::FeatureList& fl (features[0]);
for (Plugin::FeatureList::const_iterator f = fl.begin(); f != fl.end(); ++f) {
-
- if ((*f).hasTimestamp) {
+
+ if (f->hasTimestamp) {
if (out) {
(*out) << (*f).timestamp.toString() << endl;
- }
+ }
- current_results->push_back (RealTime::realTime2Frame ((*f).timestamp, (nframes_t) floor(sample_rate)));
+ current_results->push_back (RealTime::realTime2Frame (f->timestamp, (framecnt_t) floor(sample_rate)));
}
}
void
TransientDetector::set_threshold (float val)
{
- if (plugin) {
- plugin->setParameter ("threshold", val);
- }
+ threshold = val;
}
void
TransientDetector::set_sensitivity (float val)
{
if (plugin) {
+ plugin->selectProgram ("Percussive onsets");
plugin->setParameter ("sensitivity", val);
}
}
}
t.sort ();
-
+
/* remove duplicates or other things that are too close */
-
+
AnalysisFeatureList::iterator i = t.begin();
AnalysisFeatureList::iterator f, b;
- const nframes64_t gap_frames = (nframes64_t) floor (gap_msecs * (sr / 1000.0));
-
+ const framecnt_t gap_frames = (framecnt_t) floor (gap_msecs * (sr / 1000.0));
+
while (i != t.end()) {
// move front iterator to just past i, and back iterator the same place
-
+
f = i;
++f;
b = f;
// move f until we find a new value that is far enough away
-
+
while ((f != t.end()) && (((*f) - (*i)) < gap_frames)) {
++f;
}
}
}
}
+
+void
+TransientDetector::update_positions (Readable* src, uint32_t channel, AnalysisFeatureList& positions)
+{
+ int const buff_size = 1024;
+ int const step_size = 64;
+
+ Sample* data = new Sample[buff_size];
+
+ AnalysisFeatureList::iterator i = positions.begin();
+
+ while (i != positions.end()) {
+
+ /* read from source */
+ framecnt_t const to_read = buff_size;
+
+ if (src->read (data, (*i) - buff_size, to_read, channel) != to_read) {
+ break;
+ }
+
+ // Simple heuristic for locating approx correct cut position.
+
+ for (int j = 0; j < (buff_size - step_size); ) {
+
+ Sample const s = abs (data[j]);
+ Sample const s2 = abs (data[j + step_size]);
+
+ if ((s2 - s) > threshold) {
+ //cerr << "Thresh exceeded. Moving pos from: " << (*i) << " to: " << (*i) - buff_size + (j + 16) << endl;
+ (*i) = (*i) - buff_size + (j + 24);
+ break;
+ }
+
+ j += step_size;
+ }
+
+ ++i;
+ }
+
+ delete [] data;
+}