# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1463578707 -3600
# Node ID 913fc1d3710a557e7d3b99dc2e34743c3aa79bc7
# Parent  d907576aa299d5babfd69afeee7d5280f0d1c0e6
Create process request in JSON version, plus a fix

diff -r d907576aa299 -r 913fc1d3710a json/VampJson.h
--- a/json/VampJson.h	Wed May 18 13:54:33 2016 +0100
+++ b/json/VampJson.h	Wed May 18 14:38:27 2016 +0100
@@ -759,6 +759,29 @@
 
         return cr;
     }
+
+    static json11::Json
+    fromProcessRequest(const Vamp::HostExt::ProcessRequest &r,
+                       PluginHandleMapper &mapper) {
+
+        json11::Json::object jo;
+        jo["pluginHandle"] = mapper.pluginToHandle(r.plugin);
+
+        json11::Json::object io;
+        io["timestamp"] = fromRealTime(r.timestamp);
+
+        json11::Json::array chans;
+        for (size_t i = 0; i < r.inputBuffers.size(); ++i) {
+            json11::Json::object c;
+            c["b64values"] = fromFloatBuffer(r.inputBuffers[i].data(),
+                                             r.inputBuffers[i].size());
+            chans.push_back(c);
+        }
+        io["inputBuffers"] = chans;
+        
+        jo["processInput"] = io;
+        return json11::Json(jo);
+    }
 };
 
 }
diff -r d907576aa299 -r 913fc1d3710a utilities/json-cli.cpp
--- a/utilities/json-cli.cpp	Wed May 18 13:54:33 2016 +0100
+++ b/utilities/json-cli.cpp	Wed May 18 14:38:27 2016 +0100
@@ -77,15 +77,15 @@
 configurePlugin(Vamp::Plugin *plugin, json11::Json j) {
     
     auto config = VampJson::toPluginConfiguration(j);
+    Vamp::HostExt::ConfigurationRequest req;
+    req.plugin = plugin;
+    req.configuration = config;
     auto loader = Vamp::HostExt::PluginLoader::getInstance();
-    auto outputs = loader->configurePlugin(plugin, config);
 
-    if (outputs.empty()) {
+    auto response = loader->configurePlugin(req);
+    if (response.outputs.empty()) {
 	throw VampJson::Failure("plugin initialisation failed (invalid channelCount, stepSize, blockSize?)");
     }
-
-    Vamp::HostExt::ConfigurationResponse response;
-    response.outputs = outputs;
     return response;
 }