Add option to limit automatable control parmaters

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

diff --git a/libs/ardour/transient_detector.cc b/libs/ardour/transient_detector.cc
index 1fda65bde14659e8495e742c4cfe22f4c6ae3d1e..4909e40741dfcaa304f08d608252d2eb85322bc3 100644 (file)
--- a/libs/ardour/transient_detector.cc
+++ b/libs/ardour/transient_detector.cc
@@ -1,9 +1,28 @@
+/*
+    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
+    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/readable.h"
 #include "ardour/transient_detector.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Vamp;
 using namespace ARDOUR;
@@ -11,19 +30,11 @@ using namespace std;
 
 /* need a static initializer function for this */
 
-string TransientDetector::_op_id = X_("libardourvampplugins:qm-onsetdetector:2");
+string TransientDetector::_op_id = X_("qm-onset");
 
 TransientDetector::TransientDetector (float sr)
        : AudioAnalyser (sr, X_("libardourvampplugins:qm-onsetdetector"))
 {
-       /* update the op_id */
-
-       _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;
 }
 
@@ -61,7 +72,7 @@ TransientDetector::use_features (Plugin::FeatureSet& features, ostream* out)
                                (*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)));
                }
        }
 
@@ -75,11 +86,15 @@ TransientDetector::set_threshold (float val)
 }
 
 void
-TransientDetector::set_sensitivity (float val)
+TransientDetector::set_sensitivity (uint32_t mode, float val)
 {
        if (plugin) {
-               plugin->selectProgram ("Percussive onsets");
-               plugin->setParameter ("sensitivity", val);
+               // see libs/vamp-plugins/OnsetDetect.cpp
+               //plugin->selectProgram ("General purpose"); // dftype = 3, sensitivity = 50, whiten = 0 (default)
+               //plugin->selectProgram ("Percussive onsets"); // dftype = 4, sensitivity = 40, whiten = 0
+               plugin->setParameter ("dftype", mode);
+               plugin->setParameter ("sensitivity", std::min (100.f, std::max (0.f, val)));
+               plugin->setParameter ("whiten", 0);
        }
 }
 
@@ -96,7 +111,7 @@ TransientDetector::cleanup_transients (AnalysisFeatureList& t, float sr, float g
 
        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()) {
 
@@ -108,7 +123,7 @@ TransientDetector::cleanup_transients (AnalysisFeatureList& t, float sr, float g
 
                // 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()) && gap_samples > 0 && (((*f) - (*i)) < gap_samples)) {
                        ++f;
                }
 
@@ -125,44 +140,36 @@ TransientDetector::cleanup_transients (AnalysisFeatureList& t, float sr, float g
 void
 TransientDetector::update_positions (Readable* src, uint32_t channel, AnalysisFeatureList& positions)
 {
-       Plugin::FeatureSet features;
-       
-       Sample* data = 0;
-       float* bufs[1] = { 0 };
-       
-       int buff_size = 1024;
-       int step_size = 64;
-       
-       data = new Sample[buff_size];
-       bufs[0] = data;
-       
+       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()) {
 
-               framecnt_t to_read;
+       while (i != positions.end()) {
 
                /* read from source */
-               to_read = buff_size;
+               samplecnt_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;){
+               for (int j = 0; j < (buff_size - step_size); ) {
 
-                       Sample s = abs (data[j]);
-                       Sample s2 = abs (data[j + step_size]);
+                       Sample const s = abs (data[j]);
+                       Sample const s2 = abs (data[j + step_size]);
 
-                       if ((s2 - s) > threshold){
+                       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 = j + step_size;
+
+                       j += step_size;
                }
 
                ++i;