changeset 1229:e699bdeef63c piper

Add files that I forgot to track on Friday (sigh)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/FeatureExtractionPluginFactory.cpp	Tue Oct 25 10:53:12 2016 +0100
@@ -0,0 +1,44 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Visualiser
+    An audio file viewer and annotation editor.
+    Centre for Digital Music, Queen Mary, University of London.
+    This file copyright 2006-2016 Chris Cannam and QMUL.
+    
+    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.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#include "PiperVampPluginFactory.h"
+#include "NativeVampPluginFactory.h"
+
+#include <QMutex>
+#include <QMutexLocker>
+
+#include "base/Preferences.h"
+
+FeatureExtractionPluginFactory *
+FeatureExtractionPluginFactory::instance()
+{
+    static QMutex mutex;
+    static FeatureExtractionPluginFactory *instance = 0;
+
+    QMutexLocker locker(&mutex);
+    
+    if (!instance) {
+
+        if (Preferences::getInstance()->getRunPluginsInProcess()) {
+            cerr << "creating native instance" << endl;
+            instance = new NativeVampPluginFactory();
+        } else {
+            cerr << "creating piper instance" << endl;
+            instance = new PiperVampPluginFactory();
+        }
+    }
+
+    return instance;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugin/FeatureExtractionPluginFactory.h	Tue Oct 25 10:53:12 2016 +0100
@@ -0,0 +1,67 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    Sonic Visualiser
+    An audio file viewer and annotation editor.
+    Centre for Digital Music, Queen Mary, University of London.
+    This file copyright 2006-2016 Chris Cannam and QMUL.
+    
+    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.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#ifndef SV_FEATURE_EXTRACTION_PLUGIN_FACTORY_H
+#define SV_FEATURE_EXTRACTION_PLUGIN_FACTORY_H
+
+#include <vamp-hostsdk/Plugin.h>
+
+#include "vamp-support/PluginStaticData.h"
+
+#include "base/BaseTypes.h"
+
+#include <QString>
+
+class FeatureExtractionPluginFactory
+{
+public:
+    static FeatureExtractionPluginFactory *instance();
+    
+    virtual ~FeatureExtractionPluginFactory() { }
+
+    /**
+     * Return all installed plugin identifiers.
+     */
+    virtual std::vector<QString> getPluginIdentifiers(QString &errorMessage) {
+        return instance()->getPluginIdentifiers(errorMessage);
+    }
+
+    /**
+     * Return static data for the given plugin.
+     */
+    virtual piper_vamp::PluginStaticData getPluginStaticData(QString identifier) {
+        return instance()->getPluginStaticData(identifier);
+    }
+
+    /**
+     * Instantiate (load) and return pointer to the plugin with the
+     * given identifier, at the given sample rate. We don't set
+     * blockSize or channels on this -- they're negotiated and handled
+     * via initialize() on the plugin itself after loading.
+     */
+    virtual Vamp::Plugin *instantiatePlugin(QString identifier,
+                                            sv_samplerate_t inputSampleRate) {
+        return instance()->instantiatePlugin(identifier, inputSampleRate);
+    }
+
+    /**
+     * Get category metadata about a plugin (without instantiating it).
+     */
+    virtual QString getPluginCategory(QString identifier) {
+        return instance()->getPluginCategory(identifier);
+    }
+};
+
+#endif