X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fonset_detector.cc;h=7325f4a520fff4d7f2de21586308e12fe7d52dcb;hb=5b4c3aa226dc95f33dc3ffae6669a24f5e8b8fe0;hp=85917041b6c15c00f687ee2a52c7658323cbfd0d;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/onset_detector.cc b/libs/ardour/onset_detector.cc
index 85917041b6..7325f4a520 100644
--- a/libs/ardour/onset_detector.cc
+++ b/libs/ardour/onset_detector.cc
@@ -1,3 +1,23 @@
+/*
+    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/onset_detector.h"
 
 #include "i18n.h"
@@ -12,6 +32,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 +76,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 +120,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()) {