# HG changeset patch # User Chris Cannam # Date 1476712505 -3600 # Node ID 8dc7ab20e8473c9a256cfa8041dcda8e0b3c700e # Parent f80773b5ec9611358e807223bfe89130ef788133 Restore plugin categories diff -r f80773b5ec96 -r 8dc7ab20e847 plugin/FeatureExtractionPluginFactory.cpp --- a/plugin/FeatureExtractionPluginFactory.cpp Mon Oct 17 14:28:43 2016 +0100 +++ b/plugin/FeatureExtractionPluginFactory.cpp Mon Oct 17 14:55:05 2016 +0100 @@ -16,9 +16,6 @@ #include "FeatureExtractionPluginFactory.h" #include "PluginIdentifier.h" -#include -#include - #include "system/System.h" #include "PluginScan.h" @@ -134,9 +131,7 @@ QString FeatureExtractionPluginFactory::getPluginCategory(QString identifier) { - //!!! (re)implement -// return m_taxonomy[identifier]; - return QString(); + return m_taxonomy[identifier]; } void @@ -144,5 +139,17 @@ { piper_vamp::ListResponse lr = m_client.listPluginData(); m_pluginData = lr.available; + + for (const auto &pd: m_pluginData) { + + QString identifier = + QString("vamp:") + QString::fromStdString(pd.pluginKey); + + QStringList catlist; + for (const auto &cs: pd.category) { + catlist.push_back(QString::fromStdString(cs)); + } + m_taxonomy[identifier] = catlist.join(" > "); + } } diff -r f80773b5ec96 -r 8dc7ab20e847 plugin/FeatureExtractionPluginFactory.h --- a/plugin/FeatureExtractionPluginFactory.h Mon Oct 17 14:28:43 2016 +0100 +++ b/plugin/FeatureExtractionPluginFactory.h Mon Oct 17 14:55:05 2016 +0100 @@ -59,6 +59,7 @@ QMutex m_mutex; std::vector m_pluginData; + std::map m_taxonomy; void populate(); };