X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Faudioanalyser.cc;h=d477026a24df8998be326335c5d710176111ddac;hb=a406d9183adc67075a4e802fd8254c2560df9964;hp=53b60f9eaa0626accbdc23fc1ee7dcfee94eb639;hpb=a4b8955f3eb87405ceafe5c8680d9439f441458e;p=ardour.git

diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc
index 53b60f9eaa..d477026a24 100644
--- a/libs/ardour/audioanalyser.cc
+++ b/libs/ardour/audioanalyser.cc
@@ -7,10 +7,10 @@
 #include <glib/gstdio.h> // for g_remove()
 
 #include "pbd/error.h"
+#include "pbd/failed_constructor.h"
 
 #include "ardour/audioanalyser.h"
 #include "ardour/readable.h"
-#include "ardour/readable.h"
 
 #include <cstring>
 
@@ -26,11 +26,11 @@ AudioAnalyser::AudioAnalyser (float sr, AnalysisPluginKey key)
 	, plugin_key (key)
 {
 	/* create VAMP plugin and initialize */
-	
+
 	if (initialize_plugin (plugin_key, sample_rate)) {
 		error << string_compose (_("cannot load VAMP plugin \"%1\""), key) << endmsg;
 		throw failed_constructor();
-	} 
+	}
 }
 
 AudioAnalyser::~AudioAnalyser ()
@@ -50,7 +50,7 @@ AudioAnalyser::initialize_plugin (AnalysisPluginKey key, float sr)
 	if (!plugin) {
 		error << string_compose (_("VAMP Plugin \"%1\" could not be loaded"), key) << endmsg;
 		return -1;
-	} 
+	}
 
 	/* we asked for the buffering adapter, so set the blocksize to
 	   something that makes for efficient disk i/o
@@ -79,7 +79,7 @@ AudioAnalyser::reset ()
 		plugin->reset ();
 	}
 }
-	
+
 int
 AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
 {
@@ -88,15 +88,15 @@ AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
 	int ret = -1;
 	bool done = false;
 	Sample* data = 0;
-	nframes64_t len = src->readable_length();
-	nframes64_t pos = 0;
+	framecnt_t len = src->readable_length();
+	framepos_t pos = 0;
 	float* bufs[1] = { 0 };
 	string tmp_path;
 
 	if (!path.empty()) {
 
 		/* store data in tmp file, not the real one */
-		
+
 		tmp_path = path;
 		tmp_path += ".tmp";
 
@@ -111,12 +111,12 @@ AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
 
 	while (!done) {
 
-		nframes64_t to_read;
-		
+		framecnt_t to_read;
+
 		/* read from source */
 
-		to_read = min ((len - pos), bufsize);
-		
+		to_read = min ((len - pos), (framecnt_t) bufsize);
+
 		if (src->read (data, pos, to_read, channel) != to_read) {
 			goto out;
 		}
@@ -126,7 +126,7 @@ AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
 		if (to_read != bufsize) {
 			memset (data + to_read, 0, (bufsize - to_read) * sizeof (Sample));
 		}
-		
+
 		features = plugin->process (bufs, RealTime::fromSeconds ((double) pos / sample_rate));
 
 		if (use_features (features, (path.empty() ? 0 : &ofile))) {