diff plugin/LADSPAPluginFactory.cpp @ 1206:659372323b45 tony-2.0-integration

Merge latest SV 3.0 branch code

--- a/plugin/LADSPAPluginFactory.cpp	Tue Oct 20 12:54:06 2015 +0100
+++ b/plugin/LADSPAPluginFactory.cpp	Fri Aug 19 15:58:57 2016 +0100
@@ -668,14 +668,11 @@
 
     generateFallbackCategories();
 
-    for (std::vector<QString>::iterator i = pathList.begin();
-	 i != pathList.end(); ++i) {
+    QStringList candidates =
+        PluginScan::getInstance()->getCandidateLibrariesFor(getPluginType());
 
-	QDir pluginDir(*i, PLUGIN_GLOB);
-
-	for (unsigned int j = 0; j < pluginDir.count(); ++j) {
-	    discoverPluginsFrom(QString("%1/%2").arg(*i).arg(pluginDir[j]));
-	}
+    for (QString c: candidates) {
+        discoverPluginsFrom(c);
     }
 }