Clean up handling of track vs region automation a bit.

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

diff --git a/libs/ardour/transient_detector.cc b/libs/ardour/transient_detector.cc
index b85700dd90c1adaabedd79fe2563e6dd24945ae8..1eca79e67de454a7433c5c594b616c37b2eb88f4 100644 (file)
--- a/libs/ardour/transient_detector.cc
+++ b/libs/ardour/transient_detector.cc
@@ -1,4 +1,4 @@
-#include <ardour/transient_detector.h>
+#include "ardour/transient_detector.h"
 
 #include "i18n.h"
 
@@ -6,20 +6,38 @@ using namespace Vamp;
 using namespace ARDOUR;
 using namespace std;
 
+/* need a static initializer function for this */
+
+string TransientDetector::_op_id = X_("libardourvampplugins:percussiononsets:2");
+
 TransientDetector::TransientDetector (float sr)
        : AudioAnalyser (sr, X_("libardourvampplugins:percussiononsets"))
 {
+       /* update the op_id */
+
+       _op_id = X_("libardourvampplugins:percussiononsets");
+
+       // XXX this should load the above-named plugin and get the current version
+
+       _op_id += ":2";
 }
 
 TransientDetector::~TransientDetector()
 {
 }
 
+string
+TransientDetector::operational_identifier()
+{
+       return _op_id;
+}
+
 int
-TransientDetector::run (const std::string& path, Readable* src, uint32_t channel, vector<nframes64_t>& results)
+TransientDetector::run (const std::string& path, Readable* src, uint32_t channel, AnalysisFeatureList& results)
 {
        current_results = &results;
        int ret = analyse (path, src, channel);
+
        current_results = 0;
        return ret;
 }
@@ -30,12 +48,12 @@ TransientDetector::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)));
                }
@@ -59,3 +77,42 @@ TransientDetector::set_sensitivity (float val)
                plugin->setParameter ("sensitivity", val);
        }
 }
+
+void
+TransientDetector::cleanup_transients (AnalysisFeatureList& t, float sr, float gap_msecs)
+{
+       if (t.empty()) {
+               return;
+       }
+
+       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));
+
+       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;
+               }
+
+               i = f;
+
+               // if f moved forward from b, we had duplicates/too-close points: get rid of them
+
+               if (b != f) {
+                       t.erase (b, f);
+               }
+       }
+}