Mercurial > hg > svcore
diff plugin/RealTimePluginFactory.cpp @ 1527:710e6250a401 zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Mon, 17 Sep 2018 13:51:14 +0100 |
parents | 48e9f538e6e9 |
children | 70e172e6cc59 |
line wrap: on
line diff
--- a/plugin/RealTimePluginFactory.cpp Mon Dec 12 15:18:52 2016 +0000 +++ b/plugin/RealTimePluginFactory.cpp Mon Sep 17 13:51:14 2018 +0100 @@ -43,21 +43,21 @@ RealTimePluginFactory::instance(QString pluginType) { if (pluginType == "ladspa") { - if (!_ladspaInstance) { -// SVDEBUG << "RealTimePluginFactory::instance(" << pluginType// << "): creating new LADSPAPluginFactory" << endl; - _ladspaInstance = new LADSPAPluginFactory(); - _ladspaInstance->discoverPlugins(); - } - return _ladspaInstance; + if (!_ladspaInstance) { +// SVDEBUG << "RealTimePluginFactory::instance(" << pluginType// << "): creating new LADSPAPluginFactory" << endl; + _ladspaInstance = new LADSPAPluginFactory(); + _ladspaInstance->discoverPlugins(); + } + return _ladspaInstance; } else if (pluginType == "dssi") { - if (!_dssiInstance) { -// SVDEBUG << "RealTimePluginFactory::instance(" << pluginType// << "): creating new DSSIPluginFactory" << endl; - _dssiInstance = new DSSIPluginFactory(); - _dssiInstance->discoverPlugins(); - } - return _dssiInstance; + if (!_dssiInstance) { +// SVDEBUG << "RealTimePluginFactory::instance(" << pluginType// << "): creating new DSSIPluginFactory" << endl; + _dssiInstance = new DSSIPluginFactory(); + _dssiInstance->discoverPlugins(); + } + return _dssiInstance; } - + else return 0; } @@ -86,18 +86,18 @@ factory = instance("dssi"); if (factory) { - const std::vector<QString> &tmp = factory->getPluginIdentifiers(); - for (size_t i = 0; i < tmp.size(); ++i) { - rv.push_back(tmp[i]); - } + const std::vector<QString> &tmp = factory->getPluginIdentifiers(); + for (size_t i = 0; i < tmp.size(); ++i) { + rv.push_back(tmp[i]); + } } factory = instance("ladspa"); if (factory) { - const std::vector<QString> &tmp = factory->getPluginIdentifiers(); - for (size_t i = 0; i < tmp.size(); ++i) { - rv.push_back(tmp[i]); - } + const std::vector<QString> &tmp = factory->getPluginIdentifiers(); + for (size_t i = 0; i < tmp.size(); ++i) { + rv.push_back(tmp[i]); + } } // Plugins can change the locale, revert it to default.