# HG changeset patch
# User Chris Cannam
# Date 1474292802 -3600
# Node ID a2ca09e95f697d96e3a11ad7e2c3dd832fccace8
# Parent  44dc11ffa560e146b0c09d28ae679770632dcada# Parent  944a65cd431456ae5377630592b83babe75a3c5a
Merge from branch outputid-string-in-featureset

diff -r 44dc11ffa560 -r a2ca09e95f69 examples/featureset.json
--- a/examples/featureset.json	Mon May 23 16:09:05 2016 +0100
+++ b/examples/featureset.json	Mon Sep 19 14:46:42 2016 +0100
@@ -1,1 +1,1 @@
-{"0": [{"b64values": "AACAPwAAAEAEAEBAAACAQAAAoEAAAMBAAADQQAAA4EA", "label": "A feature", "timestamp": {"n": 141590000, "s": 3}}]}
+{"outputid": [{"b64values": "AACAPwAAAEAEAEBAAACAQAAAoEAAAMBAAADQQAAA4EA", "label": "A feature", "timestamp": {"n": 141590000, "s": 3}}]}
diff -r 44dc11ffa560 -r a2ca09e95f69 examples/processresponse.json
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/processresponse.json	Mon Sep 19 14:46:42 2016 +0100
@@ -0,0 +1,2 @@
+{"pluginHandle":12345,"features":{"outputid": [{"b64values": "AACAPwAAAEAEAEBAAACAQAAAoEAAAMBAAADQQAAA4EA", "label": "A feature", "timestamp": {"n": 141590000, "s": 3}}]}}
+
diff -r 44dc11ffa560 -r a2ca09e95f69 schema/configurationresponse.json
--- a/schema/configurationresponse.json	Mon May 23 16:09:05 2016 +0100
+++ b/schema/configurationresponse.json	Mon Sep 19 14:46:42 2016 +0100
@@ -1,9 +1,12 @@
 {
     "id": "http://vamp-plugins.org/json/schema/configurationresponse#",
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "schema for a serialised response to a request to configure a Vamp plugin; normally served as the response field of an object matching the plain response schema",
+    "description": "schema for a serialised response to a request to configure a Vamp plugin; normally served as the content field of an object matching the plain response schema",
     "type": "object",
     "properties": {
+	"pluginHandle": {
+	    "type": "number"
+	},
 	"outputList": {
 	    "type": "array",
 	    "items": { "$ref": "http://vamp-plugins.org/json/schema/outputdescriptor#" }
diff -r 44dc11ffa560 -r a2ca09e95f69 schema/featureset.json
--- a/schema/featureset.json	Mon May 23 16:09:05 2016 +0100
+++ b/schema/featureset.json	Mon Sep 19 14:46:42 2016 +0100
@@ -4,7 +4,7 @@
     "description": "schema for a Vamp::Plugin::FeatureSet serialisation",
     "type": "object",
     "patternProperties": {
-	"^[0-9]+$": {
+	"^[a-zA-Z0-9_-]+$": {
 	    "type": "array",
 	    "items": { "$ref": "http://vamp-plugins.org/json/schema/feature#" }
 	}
diff -r 44dc11ffa560 -r a2ca09e95f69 schema/loadresponse.json
--- a/schema/loadresponse.json	Mon May 23 16:09:05 2016 +0100
+++ b/schema/loadresponse.json	Mon Sep 19 14:46:42 2016 +0100
@@ -1,7 +1,7 @@
 {
     "id": "http://vamp-plugins.org/json/schema/loadresponse#",
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "schema for a serialised response to a load request for a Vamp Plugin; normally served as the response field of an object matching the plain response schema",
+    "description": "schema for a serialised response to a load request for a Vamp Plugin; normally served as the content field of an object matching the plain response schema",
     "type": "object",
     "properties": {
 	"pluginHandle": {
diff -r 44dc11ffa560 -r a2ca09e95f69 schema/processresponse.json
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/schema/processresponse.json	Mon Sep 19 14:46:42 2016 +0100
@@ -0,0 +1,17 @@
+{
+    "id": "http://vamp-plugins.org/json/schema/processresponse#",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "schema for a serialised response from processing a data block using a Vamp plugin; normally served as the content field of an object matching the plain response schema",
+    "type": "object",
+    "properties": {
+	"pluginHandle": {
+	    "type": "number"
+	},
+	"features": {
+	    "$ref": "http://vamp-plugins.org/json/schema/featureset#"
+	}
+    },
+    "required": [ "pluginHandle", "features" ],
+    "additionalProperties": false
+}
+