comparison json/VampJson.h @ 64:85ec33975434

Support split OutputDescriptor, and plugins rather than pluginData in listResponse from SDK

             throw Failure("invalid sample type string: " + text);
         }
     }
 
     static json11::Json
-    fromOutputDescriptor(const Vamp::Plugin::OutputDescriptor &desc) {
+    fromConfiguredOutputDescriptor(const Vamp::Plugin::OutputDescriptor &desc) {
         json11::Json::object jo {
-            { "basic", fromBasicDescriptor(desc) },
             { "unit", desc.unit },
             { "sampleType", fromSampleType(desc.sampleType) },
             { "sampleRate", desc.sampleRate },
             { "hasDuration", desc.hasDuration }
         };

             jo["quantizeStep"] = desc.quantizeStep;
         }
         return json11::Json(jo);
     }
     
+    static json11::Json
+    fromOutputDescriptor(const Vamp::Plugin::OutputDescriptor &desc) {
+        json11::Json::object jo {
+            { "basic", fromBasicDescriptor(desc) },
+            { "configured", fromConfiguredOutputDescriptor(desc) }
+        };
+        return json11::Json(jo);
+    }
+    
     static Vamp::Plugin::OutputDescriptor
-    toOutputDescriptor(json11::Json j) {
+    toConfiguredOutputDescriptor(json11::Json j) {
 
         Vamp::Plugin::OutputDescriptor od;
         if (!j.is_object()) {
             throw Failure("object expected for output descriptor");
         }
     
-        toBasicDescriptor(j["basic"], od);
-
         od.unit = j["unit"].string_value();
 
         od.sampleType = toSampleType(j["sampleType"].string_value());
 
         if (!j["sampleRate"].is_number()) {

             od.isQuantized = true;
             od.quantizeStep = j["quantizeStep"].number_value();
         } else {
             od.isQuantized = false;
         }
+
+        return od;
+    }
+    
+    static Vamp::Plugin::OutputDescriptor
+    toOutputDescriptor(json11::Json j) {
+
+        Vamp::Plugin::OutputDescriptor od;
+        if (!j.is_object()) {
+            throw Failure("object expected for output descriptor");
+        }
+
+        od = toConfiguredOutputDescriptor(j);
+    
+        toBasicDescriptor(j["basic"], od);
 
         return od;
     }
 
     static json11::Json

         json11::Json::object jo;
         jo["type"] = "list";
         jo["success"] = true;
 
         json11::Json::array arr;
-        for (const auto &a: resp.pluginData) {
+        for (const auto &a: resp.plugins) {
             arr.push_back(fromPluginStaticData(a));
         }
         json11::Json::object po;
         po["plugins"] = arr;
 

     toVampResponse_List(json11::Json j) {
 
         Vamp::HostExt::ListResponse resp;
         if (successful(j)) {
             for (const auto &a: j["content"]["plugins"].array_items()) {
-                resp.pluginData.push_back(toPluginStaticData(a));
+                resp.plugins.push_back(toPluginStaticData(a));
             }
         }
         return resp;
     }