# HG changeset patch
# User Chris Cannam <cannam@all-day-breakfast.com>
# Date 1486646735 0
# Node ID 61034472c30419473fc209769489658e10635527
# Parent  587e9691a44eddceb974276edad684195bf22033
Rename methods to avoid referring to plugins in Piper-world

diff -r 587e9691a44e -r 61034472c304 vamp-client/CapnpRRClient.h
--- a/vamp-client/CapnpRRClient.h	Thu Feb 09 12:54:00 2017 +0000
+++ b/vamp-client/CapnpRRClient.h	Thu Feb 09 13:25:35 2017 +0000
@@ -139,7 +139,7 @@
     // Loader methods:
 
     ListResponse
-    listPluginData(const ListRequest &req) override {
+    list(const ListRequest &req) override {
 
         LOG_E("CapnpRRClient::listPluginData called");
         
@@ -167,7 +167,7 @@
     }
     
     LoadResponse
-    loadPlugin(const LoadRequest &req) override {
+    load(const LoadRequest &req) override {
 
         LOG_E("CapnpRRClient::loadPlugin called");
         
diff -r 587e9691a44e -r 61034472c304 vamp-client/Loader.h
--- a/vamp-client/Loader.h	Thu Feb 09 12:54:00 2017 +0000
+++ b/vamp-client/Loader.h	Thu Feb 09 13:25:35 2017 +0000
@@ -44,8 +44,8 @@
 class Loader
 {
 public:
-    virtual ListResponse listPluginData(const ListRequest &) = 0;
-    virtual LoadResponse loadPlugin(const LoadRequest &) = 0;
+    virtual ListResponse list(const ListRequest &) = 0;
+    virtual LoadResponse load(const LoadRequest &) = 0;
 };
 
 }
diff -r 587e9691a44e -r 61034472c304 vamp-client/qt/AutoPlugin.h
--- a/vamp-client/qt/AutoPlugin.h	Thu Feb 09 12:54:00 2017 +0000
+++ b/vamp-client/qt/AutoPlugin.h	Thu Feb 09 13:25:35 2017 +0000
@@ -71,7 +71,7 @@
         req.inputSampleRate = inputSampleRate;
         req.adapterFlags = adapterFlags;
         try {
-            LoadResponse resp = m_client.loadPlugin(req);
+            LoadResponse resp = m_client.load(req);
             m_plugin = resp.plugin;
         } catch (ServerCrashed c) {
             log(std::string("AutoPlugin: Server crashed: ") + c.what());
diff -r 587e9691a44e -r 61034472c304 vamp-client/qt/test.cpp
--- a/vamp-client/qt/test.cpp	Thu Feb 09 12:54:00 2017 +0000
+++ b/vamp-client/qt/test.cpp	Thu Feb 09 13:25:35 2017 +0000
@@ -60,7 +60,7 @@
             
         piper_vamp::client::CapnpRRClient client(&transport, nullptr);
 
-        piper_vamp::ListResponse lr = client.listPluginData({});
+        piper_vamp::ListResponse lr = client.list({});
         cerr << "Plugins available:" << endl;
         int i = 1;
         for (const auto &p: lr.available) {
@@ -70,7 +70,7 @@
         piper_vamp::LoadRequest req;
         req.pluginKey = "vamp-example-plugins:zerocrossing";
         req.inputSampleRate = 16;
-        piper_vamp::LoadResponse resp = client.loadPlugin(req);
+        piper_vamp::LoadResponse resp = client.load(req);
         Vamp::Plugin *plugin = resp.plugin;
     
         if (!plugin->initialise(1, 4, 4)) {