comparison plugin/LADSPAPluginFactory.cpp @ 1182:a1f410f895d3 3.0-integration

Merge from branch pluginscan
author Chris Cannam
date Fri, 15 Apr 2016 16:26:15 +0100
parents 6b1af0f05f06
children 6b847a59d908
comparison
equal deleted inserted replaced
1175:4018fc0189bc 1182:a1f410f895d3
666 } 666 }
667 #endif // HAVE_LRDF 667 #endif // HAVE_LRDF
668 668
669 generateFallbackCategories(); 669 generateFallbackCategories();
670 670
671 for (std::vector<QString>::iterator i = pathList.begin(); 671 QStringList candidates =
672 i != pathList.end(); ++i) { 672 PluginScan::getInstance()->getCandidateLibrariesFor(getPluginType());
673 673
674 QDir pluginDir(*i, PLUGIN_GLOB); 674 for (QString c: candidates) {
675 675 discoverPluginsFrom(c);
676 for (unsigned int j = 0; j < pluginDir.count(); ++j) {
677 discoverPluginsFrom(QString("%1/%2").arg(*i).arg(pluginDir[j]));
678 }
679 } 676 }
680 } 677 }
681 678
682 void 679 void
683 LADSPAPluginFactory::discoverPluginsFrom(QString soname) 680 LADSPAPluginFactory::discoverPluginsFrom(QString soname)