Mercurial > hg > piper-cpp

diff vamp-server/convert.cpp @ 133:74a7c2a8d6b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch listargs
author Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 04 Nov 2016 10:43:49 +0000
parents b37530377d6e
children e558e042d9c7
line wrap: on
line diff
--- a/vamp-server/convert.cpp	Fri Oct 28 14:31:58 2016 +0100
+++ b/vamp-server/convert.cpp	Fri Nov 04 10:43:49 2016 +0000
@@ -213,7 +213,7 @@
     switch (rr.type) {
 
     case RRType::List:
-        VampJson::toRpcRequest_List(j, err); // type check only
+        rr.listRequest = VampJson::toRpcRequest_List(j, err);
         break;
     case RRType::Load:
         rr.loadRequest = VampJson::toRpcRequest_Load(j, err);
@@ -249,7 +249,7 @@
     switch (rr.type) {
 
     case RRType::List:
-        j = VampJson::fromRpcRequest_List(id);
+        j = VampJson::fromRpcRequest_List(rr.listRequest, id);
         break;
     case RRType::Load:
         j = VampJson::fromRpcRequest_Load(rr.loadRequest, id);
@@ -383,7 +383,7 @@
     switch (rr.type) {
 
     case RRType::List:
-        VampnProto::readRpcRequest_List(reader); // type check only
+        VampnProto::readRpcRequest_List(rr.listRequest, reader);
         break;
     case RRType::Load:
         VampnProto::readRpcRequest_Load(rr.loadRequest, reader);
@@ -416,7 +416,7 @@
     switch (rr.type) {
 
     case RRType::List:
-        VampnProto::buildRpcRequest_List(builder);
+        VampnProto::buildRpcRequest_List(builder, rr.listRequest);
         break;
     case RRType::Load:
         VampnProto::buildRpcRequest_Load(builder, rr.loadRequest);