2.X commits up to and including 7519

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

diff --git a/libs/ardour/transient_detector.cc b/libs/ardour/transient_detector.cc
index b92bf5fb2de61a2034154c901f79881efca0b4db..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,18 +6,20 @@ using namespace Vamp;
 using namespace ARDOUR;
 using namespace std;
 
-string TransientDetector::_op_id;
+/* need a static initializer function for this */
+
+string TransientDetector::_op_id = X_("libardourvampplugins:percussiononsets:2");
 
 TransientDetector::TransientDetector (float sr)
        : AudioAnalyser (sr, X_("libardourvampplugins:percussiononsets"))
 {
-       if (_op_id.empty()) {
-               _op_id = X_("libardourvampplugins:percussiononsets");
+       /* update the op_id */
 
-               // XXX this should load the above-named plugin and get the current version
+       _op_id = X_("libardourvampplugins:percussiononsets");
 
-               _op_id += ":2";
-       }
+       // XXX this should load the above-named plugin and get the current version
+
+       _op_id += ":2";
 }
 
 TransientDetector::~TransientDetector()
@@ -46,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)));
                }
@@ -84,23 +86,23 @@ TransientDetector::cleanup_transients (AnalysisFeatureList& t, float sr, float g
        }
 
        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;
                }