/*
- Copyright (C) 2012 Paul Davis
+ 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
#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 <cstring>
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace Vamp;
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;
something that makes for efficient disk i/o
*/
- bufsize = 65536;
- stepsize = bufsize;
+ bufsize = 1024;
+ stepsize = 512;
if (plugin->getMinChannelCount() > 1) {
delete plugin;
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;
- framecnt_t len = src->readable_length();
- framepos_t pos = 0;
+ samplecnt_t len = src->readable_length();
+ samplepos_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) {
- framecnt_t to_read;
+ samplecnt_t to_read;
/* read from source */
- to_read = min ((len - pos), (framecnt_t) bufsize);
+ to_read = min ((len - pos), (samplecnt_t) bufsize);
if (src->read (data, pos, to_read, channel) != to_read) {
goto out;
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;
}
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;