Mercurial > hg > piper-cpp

comparison utilities/vampipe-convert.cpp @ 55:38780f15ac8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make RequestResponse types more consistent by adding plugin to ConfigurationResponse and introducing a FinishRequest
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 19 Sep 2016 13:35:56 +0100
parents 524a6d5ee813
children 815e94fedc1c
comparison
equal deleted inserted replaced
54:524a6d5ee813 55:38780f15ac8d
111 break; 111 break;
112 case RRType::Process: 112 case RRType::Process:
113 rr.processRequest = VampJson::toVampRequest_Process(j, mapper, serialisation); 113 rr.processRequest = VampJson::toVampRequest_Process(j, mapper, serialisation);
114 break; 114 break;
115 case RRType::Finish: 115 case RRType::Finish:
116 rr.finishPlugin = VampJson::toVampRequest_Finish(j, mapper); 116 rr.finishRequest = VampJson::toVampRequest_Finish(j, mapper);
117 break; 117 break;
118 case RRType::NotValid: 118 case RRType::NotValid:
119 break; 119 break;
120 } 120 }
121 121
146 case RRType::Process: 146 case RRType::Process:
147 j = VampJson::fromVampRequest_Process 147 j = VampJson::fromVampRequest_Process
148 (rr.processRequest, mapper, serialisation); 148 (rr.processRequest, mapper, serialisation);
149 break; 149 break;
150 case RRType::Finish: 150 case RRType::Finish:
151 j = VampJson::fromVampRequest_Finish(rr.finishPlugin, mapper); 151 j = VampJson::fromVampRequest_Finish(rr.finishRequest, mapper);
152 break; 152 break;
153 case RRType::NotValid: 153 case RRType::NotValid:
154 break; 154 break;
155 } 155 }
156 156
184 break; 184 break;
185 case RRType::Load: 185 case RRType::Load:
186 rr.loadResponse = VampJson::toVampResponse_Load(j, mapper); 186 rr.loadResponse = VampJson::toVampResponse_Load(j, mapper);
187 break; 187 break;
188 case RRType::Configure: 188 case RRType::Configure:
189 rr.configurationResponse = VampJson::toVampResponse_Configure(j); 189 rr.configurationResponse = VampJson::toVampResponse_Configure(j, mapper);
190 break; 190 break;
191 case RRType::Process: 191 case RRType::Process:
192 rr.processResponse = VampJson::toVampResponse_Process(j, mapper, serialisation); 192 rr.processResponse = VampJson::toVampResponse_Process(j, mapper, serialisation);
193 break; 193 break;
194 case RRType::Finish: 194 case RRType::Finish:
224 break; 224 break;
225 case RRType::Load: 225 case RRType::Load:
226 j = VampJson::fromVampResponse_Load(rr.loadResponse, mapper); 226 j = VampJson::fromVampResponse_Load(rr.loadResponse, mapper);
227 break; 227 break;
228 case RRType::Configure: 228 case RRType::Configure:
229 j = VampJson::fromVampResponse_Configure(rr.configurationResponse); 229 j = VampJson::fromVampResponse_Configure(rr.configurationResponse,
230 mapper);
230 break; 231 break;
231 case RRType::Process: 232 case RRType::Process:
232 j = VampJson::fromVampResponse_Process 233 j = VampJson::fromVampResponse_Process
233 (rr.processResponse, mapper, serialisation); 234 (rr.processResponse, mapper, serialisation);
234 break; 235 break;
269 break; 270 break;
270 case RRType::Process: 271 case RRType::Process:
271 VampnProto::readVampRequest_Process(rr.processRequest, reader, mapper); 272 VampnProto::readVampRequest_Process(rr.processRequest, reader, mapper);
272 break; 273 break;
273 case RRType::Finish: 274 case RRType::Finish:
274 VampnProto::readVampRequest_Finish(rr.finishPlugin, reader, mapper); 275 VampnProto::readVampRequest_Finish(rr.finishRequest, reader, mapper);
275 break; 276 break;
276 case RRType::NotValid: 277 case RRType::NotValid:
277 break; 278 break;
278 } 279 }
279 280
300 break; 301 break;
301 case RRType::Process: 302 case RRType::Process:
302 VampnProto::buildVampRequest_Process(builder, rr.processRequest, mapper); 303 VampnProto::buildVampRequest_Process(builder, rr.processRequest, mapper);
303 break; 304 break;
304 case RRType::Finish: 305 case RRType::Finish:
305 VampnProto::buildVampRequest_Finish(builder, rr.finishPlugin, mapper); 306 VampnProto::buildVampRequest_Finish(builder, rr.finishRequest, mapper);
306 break; 307 break;
307 case RRType::NotValid: 308 case RRType::NotValid:
308 break; 309 break;
309 } 310 }
310 311
332 case RRType::Load: 333 case RRType::Load:
333 VampnProto::readVampResponse_Load(rr.loadResponse, reader, mapper); 334 VampnProto::readVampResponse_Load(rr.loadResponse, reader, mapper);
334 break; 335 break;
335 case RRType::Configure: 336 case RRType::Configure:
336 VampnProto::readVampResponse_Configure(rr.configurationResponse, 337 VampnProto::readVampResponse_Configure(rr.configurationResponse,
337 reader); 338 reader, mapper);
338 break; 339 break;
339 case RRType::Process: 340 case RRType::Process:
340 VampnProto::readVampResponse_Process(rr.processResponse, reader, mapper); 341 VampnProto::readVampResponse_Process(rr.processResponse, reader, mapper);
341 break; 342 break;
342 case RRType::Finish: 343 case RRType::Finish:
368 break; 369 break;
369 case RRType::Load: 370 case RRType::Load:
370 VampnProto::buildVampResponse_Load(builder, rr.loadResponse, mapper); 371 VampnProto::buildVampResponse_Load(builder, rr.loadResponse, mapper);
371 break; 372 break;
372 case RRType::Configure: 373 case RRType::Configure:
373 VampnProto::buildVampResponse_Configure(builder, rr.configurationResponse); 374 VampnProto::buildVampResponse_Configure(builder, rr.configurationResponse, mapper);
374 break; 375 break;
375 case RRType::Process: 376 case RRType::Process:
376 VampnProto::buildVampResponse_Process(builder, rr.processResponse, mapper); 377 VampnProto::buildVampResponse_Process(builder, rr.processResponse, mapper);
377 break; 378 break;
378 case RRType::Finish: 379 case RRType::Finish: