comparison capnproto/VampnProto.h @ 70:302a8e35248c

Begin capnp RPC test

         }
     }
 
     static void
     readExtractorStaticData(Vamp::HostExt::PluginStaticData &d,
-                         const ExtractorStaticData::Reader &r) {
+                            const ExtractorStaticData::Reader &r) {
         
         d.pluginKey = r.getKey();
 
         readBasicDescriptor(d.basic, r.getBasic());
 

         readFeatureSet(pr.features, r.getFeatures(),
                        *pmapper.handleToOutputIdMapper(r.getHandle()));
     }
 
     static void
+    buildFinishResponse(FinishResponse::Builder &b,
+                        const Vamp::HostExt::ProcessResponse &pr,
+                        const PluginHandleMapper &pmapper) {
+
+        b.setHandle(pmapper.pluginToHandle(pr.plugin));
+        auto f = b.initFeatures();
+        buildFeatureSet(f, pr.features,
+                        *pmapper.pluginToOutputIdMapper(pr.plugin));
+    }
+    
+    static void
+    readFinishResponse(Vamp::HostExt::ProcessResponse &pr,
+                       const FinishResponse::Reader &r,
+                       const PluginHandleMapper &pmapper) {
+
+        auto h = r.getHandle();
+        pr.plugin = pmapper.handleToPlugin(h);
+        readFeatureSet(pr.features, r.getFeatures(),
+                       *pmapper.handleToOutputIdMapper(r.getHandle()));
+    }
+
+    static void
     buildRpcRequest_List(RpcRequest::Builder &b) {
         b.getRequest().initList();
     }
 
     static void

     buildRpcResponse_Finish(RpcResponse::Builder &b,
                              const Vamp::HostExt::ProcessResponse &pr,
                              const PluginHandleMapper &pmapper) {
 
         auto u = b.getResponse().initFinish();
-        buildProcessResponse(u, pr, pmapper);
+        buildFinishResponse(u, pr, pmapper);
     }
 
     static void
     buildRpcResponse_Error(RpcResponse::Builder &b,
                             const std::string &errorText,

                             const PluginHandleMapper &pmapper) {
         if (getRequestResponseType(r) != RRType::Finish) {
             throw std::logic_error("not a finish response");
         }
         resp = {};
-        readProcessResponse(resp, r.getResponse().getFinish(), pmapper);
+        readFinishResponse(resp, r.getResponse().getFinish(), pmapper);
     }
 };
 
 }