comparison vamp-server/simple-server.cpp @ 133:74a7c2a8d6b6

Merge from branch listargs
author Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 04 Nov 2016 10:43:49 +0000
parents b37530377d6e
children 9da826f812cb
comparison
equal deleted inserted replaced
126:2004ec2b653e 133:74a7c2a8d6b6
216 VampJson::BufferSerialisation::Array; 216 VampJson::BufferSerialisation::Array;
217 217
218 switch (rr.type) { 218 switch (rr.type) {
219 219
220 case RRType::List: 220 case RRType::List:
221 VampJson::toRpcRequest_List(j, err); // type check only 221 rr.listRequest = VampJson::toRpcRequest_List(j, err);
222 break; 222 break;
223 case RRType::Load: 223 case RRType::Load:
224 rr.loadRequest = VampJson::toRpcRequest_Load(j, err); 224 rr.loadRequest = VampJson::toRpcRequest_Load(j, err);
225 break; 225 break;
226 case RRType::Configure: 226 case RRType::Configure:
313 rr.id = readId(reader); 313 rr.id = readId(reader);
314 314
315 switch (rr.type) { 315 switch (rr.type) {
316 316
317 case RRType::List: 317 case RRType::List:
318 VampnProto::readRpcRequest_List(reader); // type check only 318 VampnProto::readRpcRequest_List(rr.listRequest, reader);
319 break; 319 break;
320 case RRType::Load: 320 case RRType::Load:
321 VampnProto::readRpcRequest_Load(rr.loadRequest, reader); 321 VampnProto::readRpcRequest_Load(rr.loadRequest, reader);
322 break; 322 break;
323 case RRType::Configure: 323 case RRType::Configure:
394 response.type = request.type; 394 response.type = request.type;
395 395
396 switch (request.type) { 396 switch (request.type) {
397 397
398 case RRType::List: 398 case RRType::List:
399 response.listResponse = LoaderRequests().listPluginData(); 399 response.listResponse =
400 LoaderRequests().listPluginData(request.listRequest);
400 response.success = true; 401 response.success = true;
401 break; 402 break;
402 403
403 case RRType::Load: 404 case RRType::Load:
404 response.loadResponse = LoaderRequests().loadPlugin(request.loadRequest); 405 response.loadResponse =
406 LoaderRequests().loadPlugin(request.loadRequest);
405 if (response.loadResponse.plugin != nullptr) { 407 if (response.loadResponse.plugin != nullptr) {
406 mapper.addPlugin(response.loadResponse.plugin); 408 mapper.addPlugin(response.loadResponse.plugin);
407 if (debug) { 409 if (debug) {
408 cerr << "piper-vamp-server " << pid << ": loaded plugin, handle = " << mapper.pluginToHandle(response.loadResponse.plugin) << endl; 410 cerr << "piper-vamp-server " << pid
411 << ": loaded plugin, handle = "
412 << mapper.pluginToHandle(response.loadResponse.plugin)
413 << endl;
409 } 414 }
410 response.success = true; 415 response.success = true;
411 } 416 }
412 break; 417 break;
413 418