another unusued parameter fix

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

diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc
index 3acfc9bce445df28043c85ba44b6309347f041a0..cf8329ae9c788cb34f8bf8a5d5f99264a8caeed8 100644 (file)
--- a/libs/ardour/audioanalyser.cc
+++ b/libs/ardour/audioanalyser.cc
@@ -1,3 +1,22 @@
+/*
+    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 <cstring>
 
 #include "vamp-hostsdk/PluginLoader.h"
@@ -7,10 +26,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>
 
@@ -88,8 +107,8 @@ 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;
 
@@ -111,11 +130,11 @@ 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;