diff utilities/json-cli.cpp @ 58:c38e12d4bbdd

Merge from branch outputid-string-in-featureset

--- a/utilities/json-cli.cpp	Wed Sep 14 14:43:37 2016 +0100
+++ b/utilities/json-cli.cpp	Mon Sep 19 14:48:43 2016 +0100
@@ -1,3 +1,6 @@
+
+//!!! This program was an early test -- it should still compile but
+//!!! it's incomplete. Remove it and use the server program instead.
 
 #include "VampJson.h"
 #include "bits/CountingPluginHandleMapper.h"
@@ -55,10 +58,10 @@
     }
     
     auto loader = PluginLoader::getInstance();
-    auto pluginData = loader->listPluginData();
+    auto resp = loader->listPluginData();
 
     Json::array j;
-    for (const auto &pd: pluginData) {
+    for (const auto &pd: resp.pluginData) {
 	j.push_back(VampJson::fromPluginStaticData(pd));
     }
     return Json(j);
@@ -105,7 +108,7 @@
 
     cerr << "Configured and initialised plugin " << handle << endl;
 
-    return VampJson::fromConfigurationResponse(response);
+    return VampJson::fromConfigurationResponse(response, mapper);
 }
 
 Json