comparison json/VampJson.h @ 51:f4244a2d55ac

Introduce and use output id mappers

         return json11::Json(jo);
     }    
 
     static json11::Json
     fromVampResponse_Process(const Vamp::HostExt::ProcessResponse &resp,
-                             const PluginOutputIdMapper &omapper,
+                             const PluginHandleMapper &pmapper,
                              BufferSerialisation serialisation) {
         
         json11::Json::object jo;
         jo["type"] = "process";
         jo["success"] = true;
         jo["errorText"] = "";
-        jo["content"] = fromFeatureSet(resp.features, omapper, serialisation);
+        jo["content"] = fromFeatureSet(resp.features,
+                                       pmapper.pluginToOutputIdMapper(resp.plugin),
+                                       serialisation);
         return json11::Json(jo);
     }
     
     static json11::Json
     fromVampRequest_Finish(Vamp::Plugin *p,

         return json11::Json(jo);
     }    
     
     static json11::Json
     fromVampResponse_Finish(const Vamp::HostExt::ProcessResponse &resp,
-                            const PluginOutputIdMapper &omapper,
+                            const PluginHandleMapper &pmapper,
                             BufferSerialisation serialisation) {
 
         json11::Json::object jo;
         jo["type"] = "finish";
         jo["success"] = true;
         jo["errorText"] = "";
-        jo["content"] = fromFeatureSet(resp.features, omapper, serialisation);
+        jo["content"] = fromFeatureSet(resp.features,
+                                       pmapper.pluginToOutputIdMapper(resp.plugin),
+                                       serialisation);
         return json11::Json(jo);
     }
 
     static json11::Json
     fromException(const std::exception &e, RRType responseType) {

         return toProcessRequest(j["content"], pmapper, serialisation);
     }
     
     static Vamp::HostExt::ProcessResponse
     toVampResponse_Process(json11::Json j,
-                           const PluginOutputIdMapper &omapper,
+                           const PluginHandleMapper &pmapper,
                            BufferSerialisation &serialisation) {
         
         Vamp::HostExt::ProcessResponse resp;
         if (successful(j)) {
-            resp.features = toFeatureSet(j["content"], omapper, serialisation);
+            auto jc = j["content"];
+            resp.features = toFeatureSet
+                (jc["features"],
+                 pmapper.handleToOutputIdMapper(jc["pluginHandle"].int_value()),
+                 serialisation);
         }
         return resp;
     }
     
     static Vamp::Plugin *

         return pmapper.handleToPlugin(j["content"]["pluginHandle"].int_value());
     }
     
     static Vamp::HostExt::ProcessResponse
     toVampResponse_Finish(json11::Json j,
-                          const PluginOutputIdMapper &omapper,
+                          const PluginHandleMapper &pmapper,
                           BufferSerialisation &serialisation) {
         
         Vamp::HostExt::ProcessResponse resp;
         if (successful(j)) {
-            resp.features = toFeatureSet(j["content"], omapper, serialisation);
+            auto jc = j["content"];
+            resp.features = toFeatureSet
+                (jc["features"],
+                 pmapper.handleToOutputIdMapper(jc["pluginHandle"].int_value()),
+                 serialisation);
         }
         return resp;
     }
 };