Mercurial > hg > piper-cpp

diff utilities/json-to-capnp.cpp @ 58:c38e12d4bbdd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch outputid-string-in-featureset
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 19 Sep 2016 14:48:43 +0100
parents 38780f15ac8d
children
line wrap: on
line diff
--- a/utilities/json-to-capnp.cpp	Wed Sep 14 14:43:37 2016 +0100
+++ b/utilities/json-to-capnp.cpp	Mon Sep 19 14:48:43 2016 +0100
@@ -55,8 +55,9 @@
 
     } else if (type == "configurationresponse") {
 	auto resp = message.initRoot<ConfigurationResponse>();
+	PreservingPluginHandleMapper mapper;
 	VampnProto::buildConfigurationResponse
-	    (resp, VampJson::toConfigurationResponse(payload));
+	    (resp, VampJson::toConfigurationResponse(payload, mapper), mapper);
 
     } else if (type == "feature") {
 	auto f = message.initRoot<Feature>();
@@ -65,8 +66,9 @@
 
     } else if (type == "featureset") {
 	auto fs = message.initRoot<FeatureSet>();
+	PreservingPluginOutputIdMapper omapper;
 	VampnProto::buildFeatureSet
-	    (fs, VampJson::toFeatureSet(payload, serialisation));
+	    (fs, VampJson::toFeatureSet(payload, omapper, serialisation), omapper);
 
     } else if (type == "loadrequest") {
 	auto req = message.initRoot<LoadRequest>();