Mercurial > hg > piper-vamp-js
changeset 25:4a5de1bb2c6a outputid-string-in-featureset
Introduce ListResponse type as well
| author | Chris Cannam |
|---|---|
| date | Mon, 19 Sep 2016 14:10:19 +0100 |
| parents | 2df80eb3e962 |
| children | 98be88612dd1 |
| files | VamPipePluginLibrary.cpp VamPipePluginLibrary.h |
| diffstat | 2 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/VamPipePluginLibrary.cpp Mon Sep 19 13:42:06 2016 +0100 +++ b/VamPipePluginLibrary.cpp Mon Sep 19 14:10:19 2016 +0100 @@ -157,14 +157,14 @@ return j.dump(); } -vector<Vamp::HostExt::PluginStaticData> +Vamp::HostExt::ListResponse VamPipePluginLibrary::listPluginData() const { - vector<Vamp::HostExt::PluginStaticData> data; + Vamp::HostExt::ListResponse resp; for (auto a: m_adapters) { - data.push_back(a.second->getStaticData()); + resp.pluginData.push_back(a.second->getStaticData()); } - return data; + return resp; } Vamp::HostExt::LoadResponse
--- a/VamPipePluginLibrary.h Mon Sep 19 13:42:06 2016 +0100 +++ b/VamPipePluginLibrary.h Mon Sep 19 14:10:19 2016 +0100 @@ -74,13 +74,14 @@ RequestOrResponse readRequest(std::string req); std::string writeResponse(const RequestOrResponse &resp) const; - //!!! no type for this in RequestResponse.h in vamp sdk, should there be? - std::vector<Vamp::HostExt::PluginStaticData> listPluginData() const; + Vamp::HostExt::ListResponse listPluginData() const; Vamp::HostExt::LoadResponse loadPlugin(Vamp::HostExt::LoadRequest r) const; Vamp::HostExt::ConfigurationResponse configurePlugin(Vamp::HostExt:: - ConfigurationRequest r) const; + ConfigurationRequest r) + const; - std::map<std::string, VamPipeAdapterInterface *> m_adapters; // pluginKey -> adapter + // map from pluginKey -> adapter + std::map<std::string, VamPipeAdapterInterface *> m_adapters; CountingPluginHandleMapper m_mapper; bool m_useBase64; };