# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1478111991 0
# Node ID 183fe1f039802799ff9604ecab05f8dad997d491
# Parent  b37530377d6e54311ead8782a132d3f489e19cb7
Update client to support list from

diff -r b37530377d6e -r 183fe1f03980 vamp-client/CapnpRRClient.h
--- a/vamp-client/CapnpRRClient.h	Wed Nov 02 18:26:47 2016 +0000
+++ b/vamp-client/CapnpRRClient.h	Wed Nov 02 18:39:51 2016 +0000
@@ -99,7 +99,7 @@
     // Loader methods:
 
     ListResponse
-    listPluginData() override {
+    listPluginData(std::vector<std::string> from) override {
 
         if (!m_transport->isOK()) {
             throw std::runtime_error("Piper server crashed or failed to start");
@@ -107,7 +107,9 @@
 
         capnp::MallocMessageBuilder message;
         piper::RpcRequest::Builder builder = message.initRoot<piper::RpcRequest>();
-        VampnProto::buildRpcRequest_List(builder);
+        ListRequest req;
+        req.from = from;
+        VampnProto::buildRpcRequest_List(builder, req);
         ReqId id = getId();
         builder.getId().setNumber(id);
 
diff -r b37530377d6e -r 183fe1f03980 vamp-client/Loader.h
--- a/vamp-client/Loader.h	Wed Nov 02 18:26:47 2016 +0000
+++ b/vamp-client/Loader.h	Wed Nov 02 18:39:51 2016 +0000
@@ -44,7 +44,7 @@
 class Loader
 {
 public:
-    virtual ListResponse listPluginData() = 0;
+    virtual ListResponse listPluginData(std::vector<std::string> from) = 0;
     virtual LoadResponse loadPlugin(const LoadRequest &) = 0;
 };
 
diff -r b37530377d6e -r 183fe1f03980 vamp-client/client.cpp
--- a/vamp-client/client.cpp	Wed Nov 02 18:26:47 2016 +0000
+++ b/vamp-client/client.cpp	Wed Nov 02 18:39:51 2016 +0000
@@ -44,11 +44,11 @@
 
 int main(int, char **)
 {
-    piper_vamp::client::ProcessQtTransport transport("../bin/piper-vamp-server",
+    piper_vamp::client::ProcessQtTransport transport("../bin/piper-vamp-simple-server",
                                                      "capnp");
     piper_vamp::client::CapnpRRClient client(&transport);
 
-    piper_vamp::ListResponse lr = client.listPluginData();
+    piper_vamp::ListResponse lr = client.listPluginData({});
     cerr << "Plugins available:" << endl;
     int i = 1;
     for (const auto &p: lr.available) {
@@ -97,7 +97,7 @@
 
     // Let's try a crazy AutoPlugin
 
-    piper_vamp::client::AutoPlugin ap("../bin/piper-vamp-server",
+    piper_vamp::client::AutoPlugin ap("../bin/piper-vamp-simple-server",
                                       "vamp-example-plugins:zerocrossing", 16, 0);
     if (!ap.isOK()) {
         cerr << "AutoPlugin creation failed" << endl;