Mercurial > hg > piper-cpp

changeset 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 8dff3213f77c
children d06300b789ea
files vamp-capnp/VampnProto.h vamp-capnp/piper.capnp.c++ vamp-capnp/piper.capnp.h vamp-json/VampJson.h vamp-server/test.sh
diffstat 5 files changed, 97 insertions(+), 158 deletions(-) [+]
line wrap: on
line diff
--- a/vamp-capnp/VampnProto.h	Fri Feb 10 14:04:22 2017 +0000
+++ b/vamp-capnp/VampnProto.h	Fri Feb 10 17:22:09 2017 +0000
@@ -382,7 +382,7 @@
         buildBasicDescriptor(basic, d.basic);
 
         b.setMaker(d.maker);
-        b.setCopyright(d.copyright);
+        b.setRights(d.copyright);
         b.setVersion(d.pluginVersion);
 
         auto clist = b.initCategory(unsigned(d.category.size()));
@@ -425,7 +425,7 @@
         readBasicDescriptor(d.basic, r.getBasic());
 
         d.maker = r.getMaker();
-        d.copyright = r.getCopyright();
+        d.copyright = r.getRights();
         d.pluginVersion = r.getVersion();
 
         d.category.clear();
--- a/vamp-capnp/piper.capnp.c++	Fri Feb 10 14:04:22 2017 +0000
+++ b/vamp-capnp/piper.capnp.c++	Fri Feb 10 17:22:09 2017 +0000
@@ -618,7 +618,7 @@
 };
 #endif  // !CAPNP_LITE
 CAPNP_DEFINE_ENUM(InputDomain_f50fb3b9c1bf75f4, f50fb3b9c1bf75f4);
-static const ::capnp::_::AlignedData<222> b_b83ac85463e6caa1 = {
+static const ::capnp::_::AlignedData<221> b_b83ac85463e6caa1 = {
   {   0,   0,   0,   0,   5,   0,   6,   0,
     161, 202, 230,  99,  84, 200,  58, 184,
      12,   0,   0,   0,   1,   0,   2,   0,
@@ -661,66 +661,66 @@
       3,   0,   0,   0,   3,   0,   0,   0,
       0,   0,   1,   0,   3,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     77,   1,   0,   0,  82,   0,   0,   0,
+     77,   1,   0,   0,  58,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+     72,   1,   0,   0,   3,   0,   1,   0,
+     84,   1,   0,   0,   2,   0,   1,   0,
+      4,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   1,   0,   4,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+     81,   1,   0,   0,  66,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
      76,   1,   0,   0,   3,   0,   1,   0,
      88,   1,   0,   0,   2,   0,   1,   0,
-      4,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   1,   0,   4,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     85,   1,   0,   0,  66,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     80,   1,   0,   0,   3,   0,   1,   0,
-     92,   1,   0,   0,   2,   0,   1,   0,
       5,   0,   0,   0,   4,   0,   0,   0,
       0,   0,   1,   0,   5,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     89,   1,   0,   0,  74,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-     88,   1,   0,   0,   3,   0,   1,   0,
-    116,   1,   0,   0,   2,   0,   1,   0,
+     85,   1,   0,   0,  74,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+     84,   1,   0,   0,   3,   0,   1,   0,
+    112,   1,   0,   0,   2,   0,   1,   0,
       6,   0,   0,   0,   1,   0,   0,   0,
       0,   0,   1,   0,   6,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-    113,   1,   0,   0, 130,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    112,   1,   0,   0,   3,   0,   1,   0,
-    124,   1,   0,   0,   2,   0,   1,   0,
+    109,   1,   0,   0, 130,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+    108,   1,   0,   0,   3,   0,   1,   0,
+    120,   1,   0,   0,   2,   0,   1,   0,
       7,   0,   0,   0,   2,   0,   0,   0,
       0,   0,   1,   0,   7,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-    121,   1,   0,   0, 130,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    120,   1,   0,   0,   3,   0,   1,   0,
-    132,   1,   0,   0,   2,   0,   1,   0,
+    117,   1,   0,   0, 130,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+    116,   1,   0,   0,   3,   0,   1,   0,
+    128,   1,   0,   0,   2,   0,   1,   0,
       8,   0,   0,   0,   5,   0,   0,   0,
       0,   0,   1,   0,   8,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-    129,   1,   0,   0,  90,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    128,   1,   0,   0,   3,   0,   1,   0,
-    156,   1,   0,   0,   2,   0,   1,   0,
+    125,   1,   0,   0,  90,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+    124,   1,   0,   0,   3,   0,   1,   0,
+    152,   1,   0,   0,   2,   0,   1,   0,
       9,   0,   0,   0,   6,   0,   0,   0,
       0,   0,   1,   0,   9,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-    153,   1,   0,   0,  74,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    152,   1,   0,   0,   3,   0,   1,   0,
-    180,   1,   0,   0,   2,   0,   1,   0,
+    149,   1,   0,   0,  74,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+    148,   1,   0,   0,   3,   0,   1,   0,
+    176,   1,   0,   0,   2,   0,   1,   0,
      10,   0,   0,   0,   6,   0,   0,   0,
       0,   0,   1,   0,  10,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-    177,   1,   0,   0,  98,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    176,   1,   0,   0,   3,   0,   1,   0,
-    188,   1,   0,   0,   2,   0,   1,   0,
+    173,   1,   0,   0,  98,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+    172,   1,   0,   0,   3,   0,   1,   0,
+    184,   1,   0,   0,   2,   0,   1,   0,
      11,   0,   0,   0,   7,   0,   0,   0,
       0,   0,   1,   0,  11,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-    185,   1,   0,   0, 130,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-    184,   1,   0,   0,   3,   0,   1,   0,
-    212,   1,   0,   0,   2,   0,   1,   0,
+    181,   1,   0,   0, 130,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+    180,   1,   0,   0,   3,   0,   1,   0,
+    208,   1,   0,   0,   2,   0,   1,   0,
     107, 101, 121,   0,   0,   0,   0,   0,
      12,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
@@ -745,8 +745,7 @@
      12,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     99, 111, 112, 121, 114, 105, 103, 104,
-    116,   0,   0,   0,   0,   0,   0,   0,
+    114, 105, 103, 104, 116, 115,   0,   0,
      12,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
@@ -849,10 +848,10 @@
   &s_f50fb3b9c1bf75f4,
   &s_f8fda10bef70a97d,
 };
-static const uint16_t m_b83ac85463e6caa1[] = {1, 11, 5, 3, 10, 0, 2, 7, 6, 8, 9, 4};
+static const uint16_t m_b83ac85463e6caa1[] = {1, 11, 5, 10, 0, 2, 7, 6, 8, 9, 3, 4};
 static const uint16_t i_b83ac85463e6caa1[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
 const ::capnp::_::RawSchema s_b83ac85463e6caa1 = {
-  0xb83ac85463e6caa1, b_b83ac85463e6caa1.words, 222, d_b83ac85463e6caa1, m_b83ac85463e6caa1,
+  0xb83ac85463e6caa1, b_b83ac85463e6caa1.words, 221, d_b83ac85463e6caa1, m_b83ac85463e6caa1,
   3, 12, i_b83ac85463e6caa1, nullptr, nullptr, { &s_b83ac85463e6caa1, nullptr, nullptr, 0, 0, nullptr }
 };
 #endif  // !CAPNP_LITE
@@ -1259,26 +1258,17 @@
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   1,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     41,   0,   0,   0,  74,   0,   0,   0,
+     41,   0,   0,   0,  82,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
      40,   0,   0,   0,   3,   0,   1,   0,
      52,   0,   0,   0,   2,   0,   1,   0,
       1,   0,   0,   0,   1,   0,   0,   0,
       0,   0,   1,   0,   1,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
-     49,   0,   0,   0,  82,   0,   0,   0,
+     49,   0,   0,   0,  74,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
      48,   0,   0,   0,   3,   0,   1,   0,
      60,   0,   0,   0,   2,   0,   1,   0,
-    115, 116, 101, 112,  83, 105, 122, 101,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      4,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      4,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,
      98, 108, 111,  99, 107,  83, 105, 122,
     101,   0,   0,   0,   0,   0,   0,   0,
       4,   0,   0,   0,   0,   0,   0,   0,
@@ -1287,11 +1277,20 @@
       0,   0,   0,   0,   0,   0,   0,   0,
       4,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+    115, 116, 101, 112,  83, 105, 122, 101,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      4,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
+      4,   0,   0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0, }
 };
 ::capnp::word const* const bp_fe907ebf410a65a4 = b_fe907ebf410a65a4.words;
 #if !CAPNP_LITE
-static const uint16_t m_fe907ebf410a65a4[] = {1, 0};
+static const uint16_t m_fe907ebf410a65a4[] = {0, 1};
 static const uint16_t i_fe907ebf410a65a4[] = {0, 1};
 const ::capnp::_::RawSchema s_fe907ebf410a65a4 = {
   0xfe907ebf410a65a4, b_fe907ebf410a65a4.words, 49, nullptr, m_fe907ebf410a65a4,
@@ -2780,10 +2779,8 @@
 namespace piper {
 
 // Basic
-#ifndef _MSC_VER
 constexpr uint16_t Basic::_capnpPrivate::dataWordSize;
 constexpr uint16_t Basic::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind Basic::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* Basic::_capnpPrivate::schema;
@@ -2791,10 +2788,8 @@
 #endif  // !CAPNP_LITE
 
 // ParameterDescriptor
-#ifndef _MSC_VER
 constexpr uint16_t ParameterDescriptor::_capnpPrivate::dataWordSize;
 constexpr uint16_t ParameterDescriptor::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind ParameterDescriptor::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* ParameterDescriptor::_capnpPrivate::schema;
@@ -2802,10 +2797,8 @@
 #endif  // !CAPNP_LITE
 
 // ConfiguredOutputDescriptor
-#ifndef _MSC_VER
 constexpr uint16_t ConfiguredOutputDescriptor::_capnpPrivate::dataWordSize;
 constexpr uint16_t ConfiguredOutputDescriptor::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind ConfiguredOutputDescriptor::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* ConfiguredOutputDescriptor::_capnpPrivate::schema;
@@ -2813,10 +2806,8 @@
 #endif  // !CAPNP_LITE
 
 // OutputDescriptor
-#ifndef _MSC_VER
 constexpr uint16_t OutputDescriptor::_capnpPrivate::dataWordSize;
 constexpr uint16_t OutputDescriptor::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind OutputDescriptor::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* OutputDescriptor::_capnpPrivate::schema;
@@ -2824,10 +2815,8 @@
 #endif  // !CAPNP_LITE
 
 // ExtractorStaticData
-#ifndef _MSC_VER
 constexpr uint16_t ExtractorStaticData::_capnpPrivate::dataWordSize;
 constexpr uint16_t ExtractorStaticData::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind ExtractorStaticData::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* ExtractorStaticData::_capnpPrivate::schema;
@@ -2835,10 +2824,8 @@
 #endif  // !CAPNP_LITE
 
 // RealTime
-#ifndef _MSC_VER
 constexpr uint16_t RealTime::_capnpPrivate::dataWordSize;
 constexpr uint16_t RealTime::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind RealTime::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* RealTime::_capnpPrivate::schema;
@@ -2846,10 +2833,8 @@
 #endif  // !CAPNP_LITE
 
 // ProcessInput
-#ifndef _MSC_VER
 constexpr uint16_t ProcessInput::_capnpPrivate::dataWordSize;
 constexpr uint16_t ProcessInput::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind ProcessInput::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* ProcessInput::_capnpPrivate::schema;
@@ -2857,10 +2842,8 @@
 #endif  // !CAPNP_LITE
 
 // Feature
-#ifndef _MSC_VER
 constexpr uint16_t Feature::_capnpPrivate::dataWordSize;
 constexpr uint16_t Feature::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind Feature::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* Feature::_capnpPrivate::schema;
@@ -2868,10 +2851,8 @@
 #endif  // !CAPNP_LITE
 
 // FeatureSet
-#ifndef _MSC_VER
 constexpr uint16_t FeatureSet::_capnpPrivate::dataWordSize;
 constexpr uint16_t FeatureSet::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind FeatureSet::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* FeatureSet::_capnpPrivate::schema;
@@ -2879,10 +2860,8 @@
 #endif  // !CAPNP_LITE
 
 // FeatureSet::FSPair
-#ifndef _MSC_VER
 constexpr uint16_t FeatureSet::FSPair::_capnpPrivate::dataWordSize;
 constexpr uint16_t FeatureSet::FSPair::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind FeatureSet::FSPair::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* FeatureSet::FSPair::_capnpPrivate::schema;
@@ -2890,10 +2869,8 @@
 #endif  // !CAPNP_LITE
 
 // Framing
-#ifndef _MSC_VER
 constexpr uint16_t Framing::_capnpPrivate::dataWordSize;
 constexpr uint16_t Framing::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind Framing::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* Framing::_capnpPrivate::schema;
@@ -2901,10 +2878,8 @@
 #endif  // !CAPNP_LITE
 
 // Configuration
-#ifndef _MSC_VER
 constexpr uint16_t Configuration::_capnpPrivate::dataWordSize;
 constexpr uint16_t Configuration::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind Configuration::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* Configuration::_capnpPrivate::schema;
@@ -2912,10 +2887,8 @@
 #endif  // !CAPNP_LITE
 
 // Configuration::PVPair
-#ifndef _MSC_VER
 constexpr uint16_t Configuration::PVPair::_capnpPrivate::dataWordSize;
 constexpr uint16_t Configuration::PVPair::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind Configuration::PVPair::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* Configuration::PVPair::_capnpPrivate::schema;
@@ -2925,10 +2898,8 @@
 const ::capnp::_::ConstList< ::piper::AdapterFlag> ADAPT_ALL_SAFE(::capnp::schemas::b_9ed58097be8bc6f3.words + 27);
 const ::capnp::_::ConstList< ::piper::AdapterFlag> ADAPT_ALL(::capnp::schemas::b_eb49b9892c5b9b83.words + 26);
 // ListRequest
-#ifndef _MSC_VER
 constexpr uint16_t ListRequest::_capnpPrivate::dataWordSize;
 constexpr uint16_t ListRequest::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind ListRequest::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* ListRequest::_capnpPrivate::schema;
@@ -2936,10 +2907,8 @@
 #endif  // !CAPNP_LITE
 
 // ListResponse
-#ifndef _MSC_VER
 constexpr uint16_t ListResponse::_capnpPrivate::dataWordSize;
 constexpr uint16_t ListResponse::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind ListResponse::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* ListResponse::_capnpPrivate::schema;
@@ -2947,10 +2916,8 @@
 #endif  // !CAPNP_LITE
 
 // LoadRequest
-#ifndef _MSC_VER
 constexpr uint16_t LoadRequest::_capnpPrivate::dataWordSize;
 constexpr uint16_t LoadRequest::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind LoadRequest::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* LoadRequest::_capnpPrivate::schema;
@@ -2958,10 +2925,8 @@
 #endif  // !CAPNP_LITE
 
 // LoadResponse
-#ifndef _MSC_VER
 constexpr uint16_t LoadResponse::_capnpPrivate::dataWordSize;
 constexpr uint16_t LoadResponse::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind LoadResponse::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* LoadResponse::_capnpPrivate::schema;
@@ -2969,10 +2934,8 @@
 #endif  // !CAPNP_LITE
 
 // ConfigurationRequest
-#ifndef _MSC_VER
 constexpr uint16_t ConfigurationRequest::_capnpPrivate::dataWordSize;
 constexpr uint16_t ConfigurationRequest::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind ConfigurationRequest::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* ConfigurationRequest::_capnpPrivate::schema;
@@ -2980,10 +2943,8 @@
 #endif  // !CAPNP_LITE
 
 // ConfigurationResponse
-#ifndef _MSC_VER
 constexpr uint16_t ConfigurationResponse::_capnpPrivate::dataWordSize;
 constexpr uint16_t ConfigurationResponse::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind ConfigurationResponse::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* ConfigurationResponse::_capnpPrivate::schema;
@@ -2991,10 +2952,8 @@
 #endif  // !CAPNP_LITE
 
 // ProcessRequest
-#ifndef _MSC_VER
 constexpr uint16_t ProcessRequest::_capnpPrivate::dataWordSize;
 constexpr uint16_t ProcessRequest::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind ProcessRequest::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* ProcessRequest::_capnpPrivate::schema;
@@ -3002,10 +2961,8 @@
 #endif  // !CAPNP_LITE
 
 // ProcessResponse
-#ifndef _MSC_VER
 constexpr uint16_t ProcessResponse::_capnpPrivate::dataWordSize;
 constexpr uint16_t ProcessResponse::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind ProcessResponse::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* ProcessResponse::_capnpPrivate::schema;
@@ -3013,10 +2970,8 @@
 #endif  // !CAPNP_LITE
 
 // FinishRequest
-#ifndef _MSC_VER
 constexpr uint16_t FinishRequest::_capnpPrivate::dataWordSize;
 constexpr uint16_t FinishRequest::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind FinishRequest::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* FinishRequest::_capnpPrivate::schema;
@@ -3024,10 +2979,8 @@
 #endif  // !CAPNP_LITE
 
 // FinishResponse
-#ifndef _MSC_VER
 constexpr uint16_t FinishResponse::_capnpPrivate::dataWordSize;
 constexpr uint16_t FinishResponse::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind FinishResponse::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* FinishResponse::_capnpPrivate::schema;
@@ -3035,10 +2988,8 @@
 #endif  // !CAPNP_LITE
 
 // Error
-#ifndef _MSC_VER
 constexpr uint16_t Error::_capnpPrivate::dataWordSize;
 constexpr uint16_t Error::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind Error::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* Error::_capnpPrivate::schema;
@@ -3046,10 +2997,8 @@
 #endif  // !CAPNP_LITE
 
 // RpcRequest
-#ifndef _MSC_VER
 constexpr uint16_t RpcRequest::_capnpPrivate::dataWordSize;
 constexpr uint16_t RpcRequest::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind RpcRequest::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* RpcRequest::_capnpPrivate::schema;
@@ -3057,10 +3006,8 @@
 #endif  // !CAPNP_LITE
 
 // RpcRequest::Id
-#ifndef _MSC_VER
 constexpr uint16_t RpcRequest::Id::_capnpPrivate::dataWordSize;
 constexpr uint16_t RpcRequest::Id::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind RpcRequest::Id::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* RpcRequest::Id::_capnpPrivate::schema;
@@ -3068,10 +3015,8 @@
 #endif  // !CAPNP_LITE
 
 // RpcRequest::Request
-#ifndef _MSC_VER
 constexpr uint16_t RpcRequest::Request::_capnpPrivate::dataWordSize;
 constexpr uint16_t RpcRequest::Request::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind RpcRequest::Request::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* RpcRequest::Request::_capnpPrivate::schema;
@@ -3079,10 +3024,8 @@
 #endif  // !CAPNP_LITE
 
 // RpcResponse
-#ifndef _MSC_VER
 constexpr uint16_t RpcResponse::_capnpPrivate::dataWordSize;
 constexpr uint16_t RpcResponse::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind RpcResponse::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* RpcResponse::_capnpPrivate::schema;
@@ -3090,10 +3033,8 @@
 #endif  // !CAPNP_LITE
 
 // RpcResponse::Id
-#ifndef _MSC_VER
 constexpr uint16_t RpcResponse::Id::_capnpPrivate::dataWordSize;
 constexpr uint16_t RpcResponse::Id::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind RpcResponse::Id::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* RpcResponse::Id::_capnpPrivate::schema;
@@ -3101,10 +3042,8 @@
 #endif  // !CAPNP_LITE
 
 // RpcResponse::Response
-#ifndef _MSC_VER
 constexpr uint16_t RpcResponse::Response::_capnpPrivate::dataWordSize;
 constexpr uint16_t RpcResponse::Response::_capnpPrivate::pointerCount;
-#endif
 #if !CAPNP_LITE
 constexpr ::capnp::Kind RpcResponse::Response::_capnpPrivate::kind;
 constexpr ::capnp::_::RawSchema const* RpcResponse::Response::_capnpPrivate::schema;
--- a/vamp-capnp/piper.capnp.h	Fri Feb 10 14:04:22 2017 +0000
+++ b/vamp-capnp/piper.capnp.h	Fri Feb 10 17:22:09 2017 +0000
@@ -1053,8 +1053,8 @@
   inline bool hasMaker() const;
   inline  ::capnp::Text::Reader getMaker() const;
 
-  inline bool hasCopyright() const;
-  inline  ::capnp::Text::Reader getCopyright() const;
+  inline bool hasRights() const;
+  inline  ::capnp::Text::Reader getRights() const;
 
   inline  ::int32_t getVersion() const;
 
@@ -1125,12 +1125,12 @@
   inline void adoptMaker(::capnp::Orphan< ::capnp::Text>&& value);
   inline ::capnp::Orphan< ::capnp::Text> disownMaker();
 
-  inline bool hasCopyright();
-  inline  ::capnp::Text::Builder getCopyright();
-  inline void setCopyright( ::capnp::Text::Reader value);
-  inline  ::capnp::Text::Builder initCopyright(unsigned int size);
-  inline void adoptCopyright(::capnp::Orphan< ::capnp::Text>&& value);
-  inline ::capnp::Orphan< ::capnp::Text> disownCopyright();
+  inline bool hasRights();
+  inline  ::capnp::Text::Builder getRights();
+  inline void setRights( ::capnp::Text::Reader value);
+  inline  ::capnp::Text::Builder initRights(unsigned int size);
+  inline void adoptRights(::capnp::Orphan< ::capnp::Text>&& value);
+  inline ::capnp::Orphan< ::capnp::Text> disownRights();
 
   inline  ::int32_t getVersion();
   inline void setVersion( ::int32_t value);
@@ -1688,10 +1688,10 @@
   }
 #endif  // !CAPNP_LITE
 
+  inline  ::int32_t getBlockSize() const;
+
   inline  ::int32_t getStepSize() const;
 
-  inline  ::int32_t getBlockSize() const;
-
 private:
   ::capnp::_::StructReader _reader;
   template <typename, ::capnp::Kind>
@@ -1720,12 +1720,12 @@
   inline ::kj::StringTree toString() const { return asReader().toString(); }
 #endif  // !CAPNP_LITE
 
+  inline  ::int32_t getBlockSize();
+  inline void setBlockSize( ::int32_t value);
+
   inline  ::int32_t getStepSize();
   inline void setStepSize( ::int32_t value);
 
-  inline  ::int32_t getBlockSize();
-  inline void setBlockSize( ::int32_t value);
-
 private:
   ::capnp::_::StructBuilder _builder;
   template <typename, ::capnp::Kind>
@@ -4212,34 +4212,34 @@
       _builder.getPointerField(2 * ::capnp::POINTERS));
 }
 
-inline bool ExtractorStaticData::Reader::hasCopyright() const {
+inline bool ExtractorStaticData::Reader::hasRights() const {
   return !_reader.getPointerField(3 * ::capnp::POINTERS).isNull();
 }
-inline bool ExtractorStaticData::Builder::hasCopyright() {
+inline bool ExtractorStaticData::Builder::hasRights() {
   return !_builder.getPointerField(3 * ::capnp::POINTERS).isNull();
 }
-inline  ::capnp::Text::Reader ExtractorStaticData::Reader::getCopyright() const {
+inline  ::capnp::Text::Reader ExtractorStaticData::Reader::getRights() const {
   return ::capnp::_::PointerHelpers< ::capnp::Text>::get(
       _reader.getPointerField(3 * ::capnp::POINTERS));
 }
-inline  ::capnp::Text::Builder ExtractorStaticData::Builder::getCopyright() {
+inline  ::capnp::Text::Builder ExtractorStaticData::Builder::getRights() {
   return ::capnp::_::PointerHelpers< ::capnp::Text>::get(
       _builder.getPointerField(3 * ::capnp::POINTERS));
 }
-inline void ExtractorStaticData::Builder::setCopyright( ::capnp::Text::Reader value) {
+inline void ExtractorStaticData::Builder::setRights( ::capnp::Text::Reader value) {
   ::capnp::_::PointerHelpers< ::capnp::Text>::set(
       _builder.getPointerField(3 * ::capnp::POINTERS), value);
 }
-inline  ::capnp::Text::Builder ExtractorStaticData::Builder::initCopyright(unsigned int size) {
+inline  ::capnp::Text::Builder ExtractorStaticData::Builder::initRights(unsigned int size) {
   return ::capnp::_::PointerHelpers< ::capnp::Text>::init(
       _builder.getPointerField(3 * ::capnp::POINTERS), size);
 }
-inline void ExtractorStaticData::Builder::adoptCopyright(
+inline void ExtractorStaticData::Builder::adoptRights(
     ::capnp::Orphan< ::capnp::Text>&& value) {
   ::capnp::_::PointerHelpers< ::capnp::Text>::adopt(
       _builder.getPointerField(3 * ::capnp::POINTERS), kj::mv(value));
 }
-inline ::capnp::Orphan< ::capnp::Text> ExtractorStaticData::Builder::disownCopyright() {
+inline ::capnp::Orphan< ::capnp::Text> ExtractorStaticData::Builder::disownRights() {
   return ::capnp::_::PointerHelpers< ::capnp::Text>::disown(
       _builder.getPointerField(3 * ::capnp::POINTERS));
 }
@@ -4807,31 +4807,31 @@
       _builder.getPointerField(1 * ::capnp::POINTERS));
 }
 
+inline  ::int32_t Framing::Reader::getBlockSize() const {
+  return _reader.getDataField< ::int32_t>(
+      0 * ::capnp::ELEMENTS);
+}
+
+inline  ::int32_t Framing::Builder::getBlockSize() {
+  return _builder.getDataField< ::int32_t>(
+      0 * ::capnp::ELEMENTS);
+}
+inline void Framing::Builder::setBlockSize( ::int32_t value) {
+  _builder.setDataField< ::int32_t>(
+      0 * ::capnp::ELEMENTS, value);
+}
+
 inline  ::int32_t Framing::Reader::getStepSize() const {
   return _reader.getDataField< ::int32_t>(
-      0 * ::capnp::ELEMENTS);
+      1 * ::capnp::ELEMENTS);
 }
 
 inline  ::int32_t Framing::Builder::getStepSize() {
   return _builder.getDataField< ::int32_t>(
-      0 * ::capnp::ELEMENTS);
+      1 * ::capnp::ELEMENTS);
 }
 inline void Framing::Builder::setStepSize( ::int32_t value) {
   _builder.setDataField< ::int32_t>(
-      0 * ::capnp::ELEMENTS, value);
-}
-
-inline  ::int32_t Framing::Reader::getBlockSize() const {
-  return _reader.getDataField< ::int32_t>(
-      1 * ::capnp::ELEMENTS);
-}
-
-inline  ::int32_t Framing::Builder::getBlockSize() {
-  return _builder.getDataField< ::int32_t>(
-      1 * ::capnp::ELEMENTS);
-}
-inline void Framing::Builder::setBlockSize( ::int32_t value) {
-  _builder.setDataField< ::int32_t>(
       1 * ::capnp::ELEMENTS, value);
 }
 
--- 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()) {
--- a/vamp-server/test.sh	Fri Feb 10 14:04:22 2017 +0000
+++ b/vamp-server/test.sh	Fri Feb 10 17:22:09 2017 +0000
@@ -74,7 +74,7 @@
 # Expected output, apart from the plugin list which seems a bit
 # fragile to check here
 cat > "$expected" <<EOF
-{"id": 6, "jsonrpc": "2.0", "method": "load", "result": {"defaultConfiguration": {"channelCount": 1, "framing": {"blockSize": 1024, "stepSize": 1024}, "parameterValues": {"sensitivity": 40, "threshold": 3}}, "handle": 1, "staticData": {"basic": {"description": "Detect percussive note onsets by identifying broadband energy rises", "identifier": "percussiononsets", "name": "Simple Percussion Onset Detector"}, "basicOutputInfo": [{"description": "Percussive note onset locations", "identifier": "onsets", "name": "Onsets"}, {"description": "Broadband energy rise detection function", "identifier": "detectionfunction", "name": "Detection Function"}], "category": ["Time", "Onsets"], "copyright": "Code copyright 2006 Queen Mary, University of London, after Dan Barry et al 2005.  Freely redistributable (BSD license)", "inputDomain": "TimeDomain", "key": "vamp-example-plugins:percussiononsets", "maker": "Vamp SDK Example Plugins", "maxChannelCount": 1, "minChannelCount": 1, "parameters": [{"basic": {"description": "Energy rise within a frequency bin necessary to count toward broadband total", "identifier": "threshold", "name": "Energy rise threshold"}, "defaultValue": 3, "extents": {"max": 20, "min": 0}, "unit": "dB", "valueNames": []}, {"basic": {"description": "Sensitivity of peak detector applied to broadband detection function", "identifier": "sensitivity", "name": "Sensitivity"}, "defaultValue": 40, "extents": {"max": 100, "min": 0}, "unit": "%", "valueNames": []}], "programs": [], "version": 2}}}
+{"id": 6, "jsonrpc": "2.0", "method": "load", "result": {"defaultConfiguration": {"channelCount": 1, "framing": {"blockSize": 1024, "stepSize": 1024}, "parameterValues": {"sensitivity": 40, "threshold": 3}}, "handle": 1, "staticData": {"basic": {"description": "Detect percussive note onsets by identifying broadband energy rises", "identifier": "percussiononsets", "name": "Simple Percussion Onset Detector"}, "basicOutputInfo": [{"description": "Percussive note onset locations", "identifier": "onsets", "name": "Onsets"}, {"description": "Broadband energy rise detection function", "identifier": "detectionfunction", "name": "Detection Function"}], "category": ["Time", "Onsets"], "inputDomain": "TimeDomain", "key": "vamp-example-plugins:percussiononsets", "maker": "Vamp SDK Example Plugins", "maxChannelCount": 1, "minChannelCount": 1, "parameters": [{"basic": {"description": "Energy rise within a frequency bin necessary to count toward broadband total", "identifier": "threshold", "name": "Energy rise threshold"}, "defaultValue": 3, "extents": {"max": 20, "min": 0}, "unit": "dB", "valueNames": []}, {"basic": {"description": "Sensitivity of peak detector applied to broadband detection function", "identifier": "sensitivity", "name": "Sensitivity"}, "defaultValue": 40, "extents": {"max": 100, "min": 0}, "unit": "%", "valueNames": []}], "programs": [], "rights": "Code copyright 2006 Queen Mary, University of London, after Dan Barry et al 2005.  Freely redistributable (BSD license)", "version": 2}}}
 {"error": {"code": 0, "message": "error in process request: plugin has not been configured"}, "jsonrpc": "2.0", "method": "process"}
 {"id": "weevil", "jsonrpc": "2.0", "method": "configure", "result": {"framing": {"blockSize": 8, "stepSize": 8}, "handle": 1, "outputList": [{"basic": {"description": "Percussive note onset locations", "identifier": "onsets", "name": "Onsets"}, "configured": {"binCount": 0, "binNames": [], "hasDuration": false, "sampleRate": 44100, "sampleType": "VariableSampleRate", "unit": ""}}, {"basic": {"description": "Broadband energy rise detection function", "identifier": "detectionfunction", "name": "Detection Function"}, "configured": {"binCount": 1, "binNames": [""], "hasDuration": false, "quantizeStep": 1, "sampleRate": 86.1328125, "sampleType": "FixedSampleRate", "unit": ""}}]}}
 {"error": {"code": 0, "message": "error in configure request: unknown plugin handle supplied to configure"}, "id": 9, "jsonrpc": "2.0", "method": "configure"}