X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudioanalyser.h;h=035390e99f9014cd842caa0cd756105834eaa0e1;hb=8de887f378b13e558bdd74e88be79dc96df9d7b4;hp=fefcd23a0e227d9765aa91a0c9ad5f1ceefaa229;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/libs/ardour/ardour/audioanalyser.h b/libs/ardour/ardour/audioanalyser.h
index fefcd23a0e..035390e99f 100644
--- a/libs/ardour/ardour/audioanalyser.h
+++ b/libs/ardour/ardour/audioanalyser.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2008 Paul Davis 
+    Copyright (C) 2008 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
@@ -24,9 +24,9 @@
 #include <string>
 #include <ostream>
 #include <fstream>
-#include <vamp-sdk/Plugin.h>
 #include <boost/utility.hpp>
-#include "ardour/audioregion.h"
+#include "vamp-sdk/Plugin.h"
+#include "ardour/types.h"
 
 namespace ARDOUR {
 
@@ -41,7 +41,7 @@ class AudioAnalyser : public boost::noncopyable {
 
 	AudioAnalyser (float sample_rate, AnalysisPluginKey key);
 	virtual ~AudioAnalyser();
-	
+
 	/* analysis object should provide a run method
 	   that accepts a path to write the results to (optionally empty)
 	   a Readable* to read data from
@@ -56,9 +56,9 @@ class AudioAnalyser : public boost::noncopyable {
 	AnalysisPlugin* plugin;
 	AnalysisPluginKey plugin_key;
 
-	nframes64_t bufsize;
-	nframes64_t stepsize;
-	
+	framecnt_t bufsize;
+	framecnt_t stepsize;
+
 	int initialize_plugin (AnalysisPluginKey name, float sample_rate);
 	int analyse (const std::string& path, Readable*, uint32_t channel);