Mercurial > hg > svcore

diff plugin/PiperVampPluginFactory.h @ 1242:c401e738793f piper

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch 3.0-integration
author Chris Cannam
date Tue, 01 Nov 2016 14:08:57 +0000
parents 42a4b058f8ba
children 75aefcc9f07d
line wrap: on
line diff
--- a/plugin/PiperVampPluginFactory.h	Fri Oct 28 15:19:12 2016 +0100
+++ b/plugin/PiperVampPluginFactory.h	Tue Nov 01 14:08:57 2016 +0000
@@ -49,10 +49,15 @@
 
 protected:
     QMutex m_mutex;
-    std::string m_serverName;
+    QStringList m_servers; // executable file paths
+    std::map<QString, QString> m_origins; // plugin identifier -> server path
     std::map<QString, piper_vamp::PluginStaticData> m_pluginData; // identifier -> data
     std::map<QString, QString> m_taxonomy; // identifier -> category string
+
     void populate(QString &errorMessage);
+    void populateFrom(QString server, QString &errorMessage);
+
+    static QStringList getServerSuffixes();
 };
 
 #endif