Move a few declarations to first use.

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

diff --git a/libs/ardour/onset_detector.cc b/libs/ardour/onset_detector.cc
index 474632115fef95e6307a1e160fd1d477afc2a189..28f3a752118752f2bd36bd55e1845af7b6f014b3 100644 (file)
--- a/libs/ardour/onset_detector.cc
+++ b/libs/ardour/onset_detector.cc
@@ -1,3 +1,4 @@
+#include <cmath>
 #include "ardour/onset_detector.h"
 
 #include "i18n.h"
@@ -12,13 +13,14 @@ string OnsetDetector::_op_id = X_("libardourvampplugins:aubioonset:2");
 
 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";
 }
 
@@ -48,14 +50,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)));
                }
        }
 
@@ -94,23 +96,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;
                }