Mercurial > hg > piper-cpp

comparison 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
comparison
equal deleted inserted replaced
50:12e3b396544c 51:f4244a2d55ac
182 break; 182 break;
183 case RRType::Configure: 183 case RRType::Configure:
184 rr.configurationResponse = VampJson::toVampResponse_Configure(j); 184 rr.configurationResponse = VampJson::toVampResponse_Configure(j);
185 break; 185 break;
186 case RRType::Process: 186 case RRType::Process:
187 rr.processResponse = VampJson::toVampResponse_Process(j, serialisation); 187 rr.processResponse = VampJson::toVampResponse_Process(j, mapper, serialisation);
188 break; 188 break;
189 case RRType::Finish: 189 case RRType::Finish:
190 rr.finishResponse = VampJson::toVampResponse_Finish(j, serialisation); 190 rr.finishResponse = VampJson::toVampResponse_Finish(j, mapper, serialisation);
191 break; 191 break;
192 case RRType::NotValid: 192 case RRType::NotValid:
193 break; 193 break;
194 } 194 }
195 195
213 j = VampJson::fromVampResponse_Configure(rr.configurationResponse); 213 j = VampJson::fromVampResponse_Configure(rr.configurationResponse);
214 break; 214 break;
215 case RRType::Process: 215 case RRType::Process:
216 j = VampJson::fromVampResponse_Process 216 j = VampJson::fromVampResponse_Process
217 (rr.processResponse, 217 (rr.processResponse,
218 mapper,
218 useBase64 ? 219 useBase64 ?
219 VampJson::BufferSerialisation::Base64 : 220 VampJson::BufferSerialisation::Base64 :
220 VampJson::BufferSerialisation::Text); 221 VampJson::BufferSerialisation::Text);
221 break; 222 break;
222 case RRType::Finish: 223 case RRType::Finish:
223 j = VampJson::fromVampResponse_Finish 224 j = VampJson::fromVampResponse_Finish
224 (rr.finishResponse, 225 (rr.finishResponse,
226 mapper,
225 useBase64 ? 227 useBase64 ?
226 VampJson::BufferSerialisation::Base64 : 228 VampJson::BufferSerialisation::Base64 :
227 VampJson::BufferSerialisation::Text); 229 VampJson::BufferSerialisation::Text);
228 break; 230 break;
229 case RRType::NotValid: 231 case RRType::NotValid:
322 case RRType::Configure: 324 case RRType::Configure:
323 VampnProto::readVampResponse_Configure(rr.configurationResponse, 325 VampnProto::readVampResponse_Configure(rr.configurationResponse,
324 reader); 326 reader);
325 break; 327 break;
326 case RRType::Process: 328 case RRType::Process:
327 VampnProto::readVampResponse_Process(rr.processResponse, reader); 329 VampnProto::readVampResponse_Process(rr.processResponse, reader, mapper);
328 break; 330 break;
329 case RRType::Finish: 331 case RRType::Finish:
330 VampnProto::readVampResponse_Finish(rr.finishResponse, reader); 332 VampnProto::readVampResponse_Finish(rr.finishResponse, reader, mapper);
331 break; 333 break;
332 case RRType::NotValid: 334 case RRType::NotValid:
333 break; 335 break;
334 } 336 }
335 337
352 break; 354 break;
353 case RRType::Configure: 355 case RRType::Configure:
354 VampnProto::buildVampResponse_Configure(builder, rr.configurationResponse); 356 VampnProto::buildVampResponse_Configure(builder, rr.configurationResponse);
355 break; 357 break;
356 case RRType::Process: 358 case RRType::Process:
357 VampnProto::buildVampResponse_Process(builder, rr.processResponse); 359 VampnProto::buildVampResponse_Process(builder, rr.processResponse, mapper);
358 break; 360 break;
359 case RRType::Finish: 361 case RRType::Finish:
360 VampnProto::buildVampResponse_Finish(builder, rr.finishResponse); 362 VampnProto::buildVampResponse_Finish(builder, rr.finishResponse, mapper);
361 break; 363 break;
362 case RRType::NotValid: 364 case RRType::NotValid:
363 break; 365 break;
364 } 366 }
365 367