Mercurial > hg > piper-vamp-js

diff VamPipePluginLibrary.h @ 26:98be88612dd1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch outputid-string-in-featureset
author Chris Cannam
date Mon, 19 Sep 2016 14:48:43 +0100
parents 4a5de1bb2c6a
children 821407e7552f
line wrap: on
line diff
--- a/VamPipePluginLibrary.h	Fri Sep 16 10:14:38 2016 +0100
+++ b/VamPipePluginLibrary.h	Mon Sep 19 14:48:43 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;
 };