/*
- Copyright (C) 2012 Paul Davis
+ Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <cmath>
#include "ardour/onset_detector.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace Vamp;
using namespace ARDOUR;
/* need a static initializer function for this */
-string OnsetDetector::_op_id = X_("libardourvampplugins:aubioonset:2");
+string OnsetDetector::_op_id = X_("aubio-onset");
OnsetDetector::OnsetDetector (float sr)
: AudioAnalyser (sr, X_("libardourvampplugins:aubioonset"))
, current_results (0)
{
- /* update the op_id */
-
- _op_id = X_("libardourvampplugins:aubioonset");
-
- // XXX this should load the above-named plugin and get the current version
-
- _op_id += ":2";
}
OnsetDetector::~OnsetDetector()
(*out) << (*f).timestamp.toString() << endl;
}
- current_results->push_back (RealTime::realTime2Frame ((*f).timestamp, (framecnt_t) floor(sample_rate)));
+ current_results->push_back (RealTime::realTime2Frame ((*f).timestamp, (samplecnt_t) floor(sample_rate)));
}
}
}
}
+void
+OnsetDetector::set_minioi (float val)
+{
+#ifdef HAVE_AUBIO4
+ if (plugin) {
+ plugin->setParameter ("minioi", val);
+ }
+#endif
+}
+
void
OnsetDetector::set_function (int val)
{
AnalysisFeatureList::iterator i = t.begin();
AnalysisFeatureList::iterator f, b;
- const framecnt_t gap_frames = (framecnt_t) floor (gap_msecs * (sr / 1000.0));
+ const samplecnt_t gap_samples = (samplecnt_t) floor (gap_msecs * (sr / 1000.0));
while (i != t.end()) {
// move f until we find a new value that is far enough away
- while ((f != t.end()) && (((*f) - (*i)) < gap_frames)) {
+ while ((f != t.end()) && (((*f) - (*i)) < gap_samples)) {
++f;
}