Merge branch 'windows+cc' into cairocanvas

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

diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc
index 98c42063015b842d55b0cd741ec45247eac21c41..fd30744a7484872ab45db79079369f1d06f05642 100644 (file)
--- a/libs/ardour/audioanalyser.cc
+++ b/libs/ardour/audioanalyser.cc
@@ -1,14 +1,37 @@
+/*
+    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-sdk/hostext/PluginLoader.h>
+
+#include <vamp-hostsdk/PluginLoader.h>
+
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 #include <glib/gstdio.h> // for g_remove()
 
-#include <pbd/error.h>
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
 
-#include <ardour/audioanalyser.h>
-#include <ardour/readable.h>
-#include <ardour/readable.h>
+#include "ardour/audioanalyser.h"
+#include "ardour/readable.h"
+
+#include <cstring>
 
 #include "i18n.h"
 
@@ -22,11 +45,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 ()
@@ -46,7 +69,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
@@ -75,7 +98,7 @@ AudioAnalyser::reset ()
                plugin->reset ();
        }
 }
-       
+
 int
 AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
 {
@@ -84,15 +107,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";
 
@@ -107,12 +130,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;
                }
@@ -122,7 +145,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))) {
@@ -157,9 +180,7 @@ AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
                g_rename (tmp_path.c_str(), path.c_str());
        }
 
-       if (data) {
-               delete [] data;
-       }
+       delete [] data;
 
        return ret;
 }