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

Merge from branch outputid-string-in-featureset

+
+//!!! 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"
 
 #include <iostream>

     if (content != Json()) {
 	throw VampJson::Failure("no content expected for list request");
     }
     
     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);
 }
 

 
     mapper.markConfigured(handle, 0, 0); //!!!
 
     cerr << "Configured and initialised plugin " << handle << endl;
 
-    return VampJson::fromConfigurationResponse(response);
+    return VampJson::fromConfigurationResponse(response, mapper);
 }
 
 Json
 handle(string input)
 {