enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

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

diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc
index 3acfc9bce445df28043c85ba44b6309347f041a0..f90edd380a094d2840daa7af61c87f814180fcc0 100644 (file)
--- a/libs/ardour/audioanalyser.cc
+++ b/libs/ardour/audioanalyser.cc
@@ -1,20 +1,39 @@
+/*
+    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"
+#include <vamp-hostsdk/PluginLoader.h>
 
+#include "pbd/gstdio_compat.h"
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
-#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>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Vamp;
@@ -45,7 +64,7 @@ AudioAnalyser::initialize_plugin (AnalysisPluginKey key, float sr)
 
        PluginLoader* loader (PluginLoader::getInstance());
 
-       plugin = loader->loadPlugin (key, sr, PluginLoader::ADAPT_ALL);
+       plugin = loader->loadPlugin (key, sr, PluginLoader::ADAPT_ALL_SAFE);
 
        if (!plugin) {
                error << string_compose (_("VAMP Plugin \"%1\" could not be loaded"), key) << endmsg;
@@ -56,8 +75,8 @@ AudioAnalyser::initialize_plugin (AnalysisPluginKey key, float sr)
           something that makes for efficient disk i/o
        */
 
-       bufsize = 65536;
-       stepsize = bufsize;
+       bufsize = 1024;
+       stepsize = 512;
 
        if (plugin->getMinChannelCount() > 1) {
                delete plugin;
@@ -83,39 +102,25 @@ AudioAnalyser::reset ()
 int
 AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
 {
-       ofstream ofile;
+       stringstream outss;
        Plugin::FeatureSet features;
        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";
-
-               ofile.open (tmp_path.c_str());
-               if (!ofile) {
-                       goto out;
-               }
-       }
 
        data = new Sample[bufsize];
        bufs[0] = data;
 
        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;
@@ -129,7 +134,7 @@ AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
 
                features = plugin->process (bufs, RealTime::fromSeconds ((double) pos / sample_rate));
 
-               if (use_features (features, (path.empty() ? 0 : &ofile))) {
+               if (use_features (features, (path.empty() ? 0 : &outss))) {
                        goto out;
                }
 
@@ -144,21 +149,15 @@ AudioAnalyser::analyse (const string& path, Readable* src, uint32_t channel)
 
        features = plugin->getRemainingFeatures ();
 
-       if (use_features (features, (path.empty() ? &ofile : 0))) {
+       if (use_features (features, (path.empty() ? 0 : &outss))) {
                goto out;
        }
 
        ret = 0;
 
   out:
-       /* works even if it has not been opened */
-       ofile.close ();
-
-       if (ret) {
-               g_remove (tmp_path.c_str());
-       } else if (!path.empty()) {
-               /* move the data file to the requested path */
-               g_rename (tmp_path.c_str(), path.c_str());
+       if (!ret) {
+               g_file_set_contents (path.c_str(), outss.str().c_str(), -1, NULL);
        }
 
        delete [] data;