comparison capnproto/VampnProto.h @ 57:7aec704705c7

Make the output ID mapper stuff safer by using shared_ptr
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 19 Sep 2016 14:43:32 +0100
parents 815e94fedc1c
children 0ea374ea96a2
comparison
equal deleted inserted replaced
56:815e94fedc1c 57:7aec704705c7
659 const PluginHandleMapper &pmapper) { 659 const PluginHandleMapper &pmapper) {
660 660
661 b.setPluginHandle(pmapper.pluginToHandle(pr.plugin)); 661 b.setPluginHandle(pmapper.pluginToHandle(pr.plugin));
662 auto f = b.initFeatures(); 662 auto f = b.initFeatures();
663 buildFeatureSet(f, pr.features, 663 buildFeatureSet(f, pr.features,
664 pmapper.pluginToOutputIdMapper(pr.plugin)); 664 *pmapper.pluginToOutputIdMapper(pr.plugin));
665 } 665 }
666 666
667 static void 667 static void
668 readProcessResponse(Vamp::HostExt::ProcessResponse &pr, 668 readProcessResponse(Vamp::HostExt::ProcessResponse &pr,
669 const ProcessResponse::Reader &r, 669 const ProcessResponse::Reader &r,
670 const PluginHandleMapper &pmapper) { 670 const PluginHandleMapper &pmapper) {
671 671
672 auto h = r.getPluginHandle(); 672 auto h = r.getPluginHandle();
673 pr.plugin = pmapper.handleToPlugin(h); 673 pr.plugin = pmapper.handleToPlugin(h);
674 readFeatureSet(pr.features, r.getFeatures(), 674 readFeatureSet(pr.features, r.getFeatures(),
675 pmapper.handleToOutputIdMapper(r.getPluginHandle())); 675 *pmapper.handleToOutputIdMapper(r.getPluginHandle()));
676 } 676 }
677 677
678 static void 678 static void
679 buildVampRequest_List(VampRequest::Builder &b) { 679 buildVampRequest_List(VampRequest::Builder &b) {
680 b.getRequest().setList(); 680 b.getRequest().setList();