comparison utilities/json-cli.cpp @ 12:828930f9a65d

Configuration request/response structs

     }
     
     return response;
 }
     
-Vamp::Plugin::OutputList
+Vamp::HostExt::ConfigurationResponse
 configurePlugin(Vamp::Plugin *plugin, json11::Json j) {
     
     auto config = VampJson::toPluginConfiguration(j);
     auto loader = Vamp::HostExt::PluginLoader::getInstance();
     auto outputs = loader->configurePlugin(plugin, config);
 
     if (outputs.empty()) {
 	throw VampJson::Failure("plugin initialisation failed (invalid channelCount, stepSize, blockSize?)");
     }
-    
-    return outputs;
+
+    Vamp::HostExt::ConfigurationResponse response;
+    response.outputs = outputs;
+    return response;
 }
 
 Json
 handle_list(Json content)
 {

 
     Plugin *plugin = mapper.handleToPlugin(handle);
     
     Json config = j["configuration"];
 
-    configurePlugin(plugin, config);
+    auto response = configurePlugin(plugin, config);
 
     mapper.markInitialised(handle);
 
     cerr << "Configured and initialised plugin " << handle << endl;
 
-    //!!! to VampJson:
-    Json::object jout;
-    Json::array outs;
-    Vamp::Plugin::OutputList vouts = plugin->getOutputDescriptors();
-    for (auto &o: vouts) {
-	outs.push_back(VampJson::fromOutputDescriptor(o));
-    }
-    jout["outputList"] = outs;
-    return Json(jout);
+    return VampJson::fromConfigurationResponse(response);
 }
 
 Json
 handle(string input)
 {