comparison plugin/PiperVampPluginFactory.cpp @ 1242:c401e738793f piper

Merge from branch 3.0-integration

 
 /*
     Sonic Visualiser
     An audio file viewer and annotation editor.
     Centre for Digital Music, Queen Mary, University of London.
-    This file copyright 2006 Chris Cannam and QMUL.
+    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

 #include <QCoreApplication>
 
 #include <iostream>
 
 #include "base/Profiler.h"
+#include "base/HelperExecPath.h"
 
 #include "vamp-client/ProcessQtTransport.h"
 #include "vamp-client/CapnpRRClient.h"
 
 using namespace std;
 
 //#define DEBUG_PLUGIN_SCAN_AND_INSTANTIATE 1
 
-PiperVampPluginFactory::PiperVampPluginFactory() :
-    // No server unless we find one - don't run arbitrary stuff from the path:
-    m_serverName()
-{
-    // Server must exist either in the same directory as this one or
-    // (preferably) a subdirectory called "piper-bin".
-    //!!! todo: merge this with plugin scan checker thingy used in main.cpp?
-    QString myDir = QCoreApplication::applicationDirPath();
-    QString name = "piper-vamp-simple-server";
-    QString path = myDir + "/piper-bin/" + name;
-    QString suffix = "";
-#ifdef _WIN32
-    suffix = ".exe";
-#endif
-    if (!QFile(path + suffix).exists()) {
-        cerr << "NOTE: Piper Vamp server not found at " << (path + suffix)
-             << ", trying in my own directory" << endl;
-        path = myDir + "/" + name;
-    }
-    if (!QFile(path + suffix).exists()) {
-        cerr << "NOTE: Piper Vamp server not found at " << (path + suffix)
-             << endl;
+PiperVampPluginFactory::PiperVampPluginFactory()
+{
+    QString serverName = "piper-vamp-simple-server";
+
+    m_servers = HelperExecPath::getHelperExecutables(serverName);
+
+    if (m_servers.empty()) {
+        cerr << "NOTE: No Piper Vamp servers found in installation;"
+             << " found none of the following:" << endl;
+        for (auto d: HelperExecPath::getHelperCandidatePaths(serverName)) {
+            cerr << "NOTE: " << d << endl;
+        }
+    }
+}
+
+QStringList
+PiperVampPluginFactory::getServerSuffixes()
+{
+    if (sizeof(void *) == 8) {
+        return { "-64", "", "-32" };
     } else {
-        m_serverName = (path + suffix).toStdString();
+        return { "", "-32" };
     }
 }
 
 vector<QString>
 PiperVampPluginFactory::getPluginIdentifiers(QString &errorMessage)
 {
     Profiler profiler("PiperVampPluginFactory::getPluginIdentifiers");
 
     QMutexLocker locker(&m_mutex);
 
-    if (m_serverName == "") {
+    if (m_servers.empty()) {
         errorMessage = QObject::tr("External plugin host executable does not appear to be installed");
         return {};
     }
     
     if (m_pluginData.empty()) {

 PiperVampPluginFactory::instantiatePlugin(QString identifier,
                                           sv_samplerate_t inputSampleRate)
 {
     Profiler profiler("PiperVampPluginFactory::instantiatePlugin");
 
+    if (m_origins.find(identifier) == m_origins.end()) {
+        cerr << "ERROR: No known server for identifier " << identifier << endl;
+        return 0;
+    }
+    
     auto psd = getPluginStaticData(identifier);
     if (psd.pluginKey == "") {
         return 0;
     }
     
     auto ap = new piper_vamp::client::AutoPlugin
-        (m_serverName, psd.pluginKey, float(inputSampleRate), 0);
+        (m_origins[identifier].toStdString(),
+         psd.pluginKey, float(inputSampleRate), 0);
+    
     if (!ap->isOK()) {
         delete ap;
         return 0;
     }
 

 }
 
 void
 PiperVampPluginFactory::populate(QString &errorMessage)
 {
-    if (m_serverName == "") return;
-
-    piper_vamp::client::ProcessQtTransport transport(m_serverName, "capnp");
+    QString someError;
+
+    for (QString s: m_servers) {
+
+        populateFrom(s, someError);
+
+        if (someError != "" && errorMessage == "") {
+            errorMessage = someError;
+        }
+    }
+}
+
+void
+PiperVampPluginFactory::populateFrom(QString server, QString &errorMessage)
+{
+    piper_vamp::client::ProcessQtTransport transport(server.toStdString(),
+                                                     "capnp");
     if (!transport.isOK()) {
         errorMessage = QObject::tr("Could not start external plugin host");
         return;
     }
 

             .arg(e.what());
         return;
     }
 
     for (const auto &pd: lr.available) {
-
+        
         QString identifier =
             QString("vamp:") + QString::fromStdString(pd.pluginKey);
 
+        if (m_origins.find(identifier) != m_origins.end()) {
+            // have it already, from a higher-priority server
+            // (e.g. 64-bit instead of 32-bit)
+            continue;
+        }
+
+        m_origins[identifier] = server;
+        
         m_pluginData[identifier] = pd;
 
         QStringList catlist;
         for (const auto &cs: pd.category) {
             catlist.push_back(QString::fromStdString(cs));