diff plugin/FeatureExtractionPluginFactory.h @ 1172:59ae7e04f7e9

Merge

--- a/plugin/FeatureExtractionPluginFactory.h	Fri Mar 04 09:50:09 2016 +0000
+++ b/plugin/FeatureExtractionPluginFactory.h	Fri Mar 04 12:29:35 2016 +0000
@@ -38,6 +38,14 @@
 
     virtual std::vector<QString> getPluginIdentifiers();
 
+    /**
+     * Return any error message arising from the initial plugin
+     * scan. The return value will either be an empty string (nothing
+     * to report) or an HTML string suitable for dropping into a
+     * dialog and showing the user.
+     */
+    virtual QString getPluginPopulationWarning() { return m_pluginScanError; }
+    
     virtual QString findPluginFile(QString soname, QString inDir = "");
 
     // We don't set blockSize or channels on this -- they're
@@ -57,8 +65,14 @@
     friend class PluginDeletionNotifyAdapter;
     void pluginDeleted(Vamp::Plugin *);
     std::map<Vamp::Plugin *, void *> m_handleMap;
+    
+    std::vector<QString> getPluginCandidateFiles();
+    std::vector<QString> winnowPluginCandidates(std::vector<QString> candidates,
+                                                QString &warningMessage);
+    
+    void generateTaxonomy();
 
-    void generateTaxonomy();
+    QString m_pluginScanError;
 };
 
 #endif