Tidy up PluginInsert's handling of how it chooses to map plugin IO to that of the...

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

diff --git a/libs/ardour/onset_detector.cc b/libs/ardour/onset_detector.cc
index 85917041b6c15c00f687ee2a52c7658323cbfd0d..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,6 +13,7 @@ string OnsetDetector::_op_id = X_("libardourvampplugins:aubioonset:2");
 
 OnsetDetector::OnsetDetector (float sr)
        : AudioAnalyser (sr, X_("libardourvampplugins:aubioonset"))
+       , current_results (0)
 {
        /* update the op_id */
 
@@ -55,7 +57,7 @@ OnsetDetector::use_features (Plugin::FeatureSet& features, ostream* 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)));
                }
        }
 
@@ -99,7 +101,7 @@ OnsetDetector::cleanup_onsets (AnalysisFeatureList& t, float sr, float gap_msecs
 
        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()) {