Mercurial > hg > vamp-plugin-sdk
comparison src/vamp-hostsdk/PluginLoader.cpp @ 477:628a5b8ff634
Revert to C++98 -- this library is not supposed to use C++11
author | Chris Cannam |
---|---|
date | Fri, 18 Nov 2016 14:02:49 +0000 |
parents | 0545cd3f1738 |
children | 762b79b49c31 |
comparison
equal
deleted
inserted
replaced
476:15348e89c1d7 | 477:628a5b8ff634 |
---|---|
211 } | 211 } |
212 | 212 |
213 PluginLoader::PluginKeyList | 213 PluginLoader::PluginKeyList |
214 PluginLoader::Impl::listPlugins() | 214 PluginLoader::Impl::listPlugins() |
215 { | 215 { |
216 if (!m_allPluginsEnumerated) enumeratePlugins({}); | 216 if (!m_allPluginsEnumerated) enumeratePlugins(Enumeration()); |
217 | 217 |
218 vector<PluginKey> plugins; | 218 vector<PluginKey> plugins; |
219 for (const auto &mi: m_pluginLibraryNameMap) { | 219 for (map<PluginKey, string>::const_iterator i = |
220 plugins.push_back(mi.first); | 220 m_pluginLibraryNameMap.begin(); |
221 i != m_pluginLibraryNameMap.end(); ++i) { | |
222 plugins.push_back(i->first); | |
221 } | 223 } |
222 | 224 |
223 return plugins; | 225 return plugins; |
224 } | 226 } |
225 | 227 |
257 string libraryName, identifier; | 259 string libraryName, identifier; |
258 if (!decomposePluginKey(enumeration.key, libraryName, identifier)) { | 260 if (!decomposePluginKey(enumeration.key, libraryName, identifier)) { |
259 std::cerr << "WARNING: Vamp::HostExt::PluginLoader: " | 261 std::cerr << "WARNING: Vamp::HostExt::PluginLoader: " |
260 << "Invalid plugin key \"" << enumeration.key | 262 << "Invalid plugin key \"" << enumeration.key |
261 << "\" in enumerate" << std::endl; | 263 << "\" in enumerate" << std::endl; |
262 return {}; | 264 return vector<string>(); |
263 } | 265 } |
264 filter.type = Files::Filter::Matching; | 266 filter.type = Files::Filter::Matching; |
265 filter.libraryNames = { libraryName }; | 267 filter.libraryNames.clear(); |
268 filter.libraryNames.push_back(libraryName); | |
266 break; | 269 break; |
267 } | 270 } |
268 | 271 |
269 case Enumeration::InLibraries: | 272 case Enumeration::InLibraries: |
270 filter.type = Files::Filter::Matching; | 273 filter.type = Files::Filter::Matching; |