Mercurial > hg > piper-cpp

diff utilities/vampipe-convert.cpp @ 51:f4244a2d55ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduce and use output id mappers
author Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 16 Sep 2016 15:10:57 +0100
parents a98ef4c2616b
children e90fd30990eb
line wrap: on
line diff
--- a/utilities/vampipe-convert.cpp	Fri Sep 16 14:15:41 2016 +0100
+++ b/utilities/vampipe-convert.cpp	Fri Sep 16 15:10:57 2016 +0100
@@ -184,10 +184,10 @@
 	rr.configurationResponse = VampJson::toVampResponse_Configure(j);
 	break;
     case RRType::Process: 
-	rr.processResponse = VampJson::toVampResponse_Process(j, serialisation);
+	rr.processResponse = VampJson::toVampResponse_Process(j, mapper, serialisation);
 	break;
     case RRType::Finish:
-	rr.finishResponse = VampJson::toVampResponse_Finish(j, serialisation);
+	rr.finishResponse = VampJson::toVampResponse_Finish(j, mapper, serialisation);
 	break;
     case RRType::NotValid:
 	break;
@@ -215,6 +215,7 @@
     case RRType::Process:
 	j = VampJson::fromVampResponse_Process
 	    (rr.processResponse,
+	     mapper,
 	     useBase64 ?
 	     VampJson::BufferSerialisation::Base64 :
 	     VampJson::BufferSerialisation::Text);
@@ -222,6 +223,7 @@
     case RRType::Finish:
 	j = VampJson::fromVampResponse_Finish
 	    (rr.finishResponse,
+	     mapper,
 	     useBase64 ?
 	     VampJson::BufferSerialisation::Base64 :
 	     VampJson::BufferSerialisation::Text);
@@ -324,10 +326,10 @@
 					       reader);
 	break;
     case RRType::Process:
-	VampnProto::readVampResponse_Process(rr.processResponse, reader);
+	VampnProto::readVampResponse_Process(rr.processResponse, reader, mapper);
 	break;
     case RRType::Finish:
-	VampnProto::readVampResponse_Finish(rr.finishResponse, reader);
+	VampnProto::readVampResponse_Finish(rr.finishResponse, reader, mapper);
 	break;
     case RRType::NotValid:
 	break;
@@ -354,10 +356,10 @@
 	VampnProto::buildVampResponse_Configure(builder, rr.configurationResponse);
 	break;
     case RRType::Process:
-	VampnProto::buildVampResponse_Process(builder, rr.processResponse);
+	VampnProto::buildVampResponse_Process(builder, rr.processResponse, mapper);
 	break;
     case RRType::Finish:
-	VampnProto::buildVampResponse_Finish(builder, rr.finishResponse);
+	VampnProto::buildVampResponse_Finish(builder, rr.finishResponse, mapper);
 	break;
     case RRType::NotValid:
 	break;