fix thinko-typo in SoloControl::soloed_by_others()

[ardour.git] / libs / ardour / onset_detector.cc

diff --git a/libs/ardour/onset_detector.cc b/libs/ardour/onset_detector.cc
index f58e64ad4ad9778757174a29e471e2b5c4f4cc48..7658bd86e8211c9db60f3018b530376cead8692d 100644 (file)
--- a/libs/ardour/onset_detector.cc
+++ b/libs/ardour/onset_detector.cc
@@ -1,6 +1,26 @@
-#include <ardour/onset_detector.h>
+/*
+    Copyright (C) 2012 Paul Davis
 
-#include "i18n.h"
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <cmath>
+#include "ardour/onset_detector.h"
+
+#include "pbd/i18n.h"
 
 using namespace Vamp;
 using namespace ARDOUR;
@@ -8,18 +28,12 @@ using namespace std;
 
 /* 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()
@@ -48,14 +62,14 @@ OnsetDetector::use_features (Plugin::FeatureSet& features, ostream* out)
        const Plugin::FeatureList& fl (features[0]);
 
        for (Plugin::FeatureList::const_iterator f = fl.begin(); f != fl.end(); ++f) {
-               
+
                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)));
                }
        }
 
@@ -78,6 +92,16 @@ OnsetDetector::set_peak_threshold (float val)
        }
 }
 
+void
+OnsetDetector::set_minioi (float val)
+{
+#ifdef HAVE_AUBIO4
+       if (plugin) {
+               plugin->setParameter ("minioi", val);
+       }
+#endif
+}
+
 void
 OnsetDetector::set_function (int val)
 {
@@ -94,23 +118,23 @@ OnsetDetector::cleanup_onsets (AnalysisFeatureList& t, float sr, float gap_msecs
        }
 
        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;
                }