Mercurial > hg > piper-cpp

diff vamp-json/VampJson.h @ 216:328ffacfc70e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Copyright -> rights
author Chris Cannam <cannam@all-day-breakfast.com>
date Fri, 10 Feb 2017 17:22:09 +0000
parents d2a32436bf09
children 02de5df3a884
line wrap: on
line diff
--- a/vamp-json/VampJson.h	Fri Feb 10 14:04:22 2017 +0000
+++ b/vamp-json/VampJson.h	Fri Feb 10 17:22:09 2017 +0000
@@ -543,7 +543,7 @@
         jo["key"] = d.pluginKey;
         jo["basic"] = fromBasicDescriptor(d.basic);
         jo["maker"] = d.maker;
-        jo["copyright"] = d.copyright;
+        jo["rights"] = d.copyright;
         jo["version"] = d.pluginVersion;
 
         json11::Json::array cat;
@@ -594,9 +594,9 @@
 
             err = "string expected for maker";
 
-        } else if (!j["copyright"].is_null() &&
-                   !j["copyright"].is_string()) {
-            err = "string expected for copyright";
+        } else if (!j["rights"].is_null() &&
+                   !j["rights"].is_string()) {
+            err = "string expected for rights";
 
         } else if (!j["category"].is_null() &&
                    !j["category"].is_array()) {
@@ -633,7 +633,7 @@
             if (failed(err)) return {};
 
             psd.maker = j["maker"].string_value();
-            psd.copyright = j["copyright"].string_value();
+            psd.copyright = j["rights"].string_value();
             psd.pluginVersion = j["version"].int_value();
 
             for (const auto &c : j["category"].array_items()) {