comparison vamp-json/VampJson.h @ 221:9aca3267809c

Various fixes to JSON writing for static output data

         for (auto &o: vouts) outinfo.push_back(fromBasicDescriptor(o));
         jo["basicOutputInfo"] = outinfo;
 
         json11::Json::object statinfo;
         auto souts = d.staticOutputInfo;
-        for (auto &s: souts) jo[s.first] = fromStaticOutputDescriptor(s.second);
-        
-        return json11::Json(jo);
-    }
-
+        for (auto &s: souts) {
+            statinfo[s.first] = fromStaticOutputDescriptor(s.second);
+        }
+        jo["staticOutputInfo"] = statinfo;
+        
+        return json11::Json(jo);
+    }
+
+    static StaticOutputInfo
+    toStaticOutputInfo(json11::Json j, std::string &err) {
+
+        if (j == json11::Json()) return {};
+
+        if (!j.is_object()) {
+            err = "object expected for static output info";
+            return {};
+        }
+
+        StaticOutputInfo sinfo;
+        auto items = j.object_items();
+        for (auto i: items) {
+            sinfo[i.first] = toStaticOutputDescriptor(i.second, err);
+            if (failed(err)) return {};
+        }
+        return sinfo;                    
+    }
+    
     static PluginStaticData
     toPluginStaticData(json11::Json j, std::string &err) {
 
         if (!j.has_shape({
                     { "key", json11::Json::STRING },

         } else if (!j["basicOutputInfo"].is_null() &&
                    !j["basicOutputInfo"].is_array()) {
             
             err = "array expected for basicOutputInfo";
 
+        } else if (!j["staticOutputInfo"].is_null() &&
+                   !j["staticOutputInfo"].is_object()) {
+            
+            err = "object expected for staticOutputInfo";
+
         } else {
 
             PluginStaticData psd;
 
             psd.pluginKey = j["key"].string_value();

                 PluginStaticData::Basic b;
                 toBasicDescriptor(bo, b, err);
                 if (failed(err)) return {};
                 psd.basicOutputInfo.push_back(b);
             }
-            
+
+            StaticOutputInfo sinfo =
+                toStaticOutputInfo(j["staticOutputInfo"], err);
+            if (failed(err)) return {};
+            psd.staticOutputInfo = sinfo;
+
             return psd;
         }
 
         // fallthrough error case
         return {};