# HG changeset patch # User Chris Cannam # Date 1478256175 0 # Node ID 7913455c77da14cfa2d5edde055c1bd03490ad66 # Parent 2ca3f7587550c7d80d0ca7b6ae1c266ca93859cd# Parent 24cc4c04d4003bf95cd8d812f4858ead9b6ae3c4 Merge from branch listargs diff -r 2ca3f7587550 -r 7913455c77da capnp/piper.capnp --- a/capnp/piper.capnp Wed Oct 12 12:52:14 2016 +0100 +++ b/capnp/piper.capnp Fri Nov 04 10:42:55 2016 +0000 @@ -119,6 +119,7 @@ [ adaptInputDomain, adaptChannelCount, adaptBufferSize ]; struct ListRequest { + from @0 :List(Text); } struct ListResponse { diff -r 2ca3f7587550 -r 7913455c77da json/schema/basic.json --- a/json/schema/basic.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/basic.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/basic#", + "id": "http://vamp-plugins.org/piper/json/schema/basic#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a common unit of basic metadata", "type": "object", diff -r 2ca3f7587550 -r 7913455c77da json/schema/configuration.json --- a/json/schema/configuration.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/configuration.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/pluginconfiguration#", + "id": "http://vamp-plugins.org/piper/json/schema/pluginconfiguration#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a bundle of configuration data capturing the setup of a feature extractor", "type": "object", diff -r 2ca3f7587550 -r 7913455c77da json/schema/configurationrequest.json --- a/json/schema/configurationrequest.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/configurationrequest.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/configurationrequest#", + "id": "http://vamp-plugins.org/piper/json/schema/configurationrequest#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a request to configure a feature extractor; may be served in the params field of a configure-method rpcrequest", "type": "object", @@ -8,7 +8,7 @@ "type": "number" }, "configuration": { - "$ref": "http://vamp-plugins.org/json/schema/configuration#" + "$ref": "http://vamp-plugins.org/piper/json/schema/configuration#" } }, "required": [ "handle", "configuration" ], diff -r 2ca3f7587550 -r 7913455c77da json/schema/configurationresponse.json --- a/json/schema/configurationresponse.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/configurationresponse.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/configurationresponse#", + "id": "http://vamp-plugins.org/piper/json/schema/configurationresponse#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a successful response to a request to configure a feature extractor; may be served in the result field of a configure-method rpcresponse", "type": "object", @@ -9,7 +9,7 @@ }, "outputList": { "type": "array", - "items": { "$ref": "http://vamp-plugins.org/json/schema/outputdescriptor#" } + "items": { "$ref": "http://vamp-plugins.org/piper/json/schema/outputdescriptor#" } } }, "required": [ "handle", "outputList" ], diff -r 2ca3f7587550 -r 7913455c77da json/schema/configuredoutputdescriptor.json --- a/json/schema/configuredoutputdescriptor.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/configuredoutputdescriptor.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/configuredoutputdescriptor#", + "id": "http://vamp-plugins.org/piper/json/schema/configuredoutputdescriptor#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for the non-static metadata fields of an output descriptor belonging to a feature extractor", "type": "object", @@ -27,7 +27,7 @@ "type": "number" }, "sampleType": { - "$ref": "http://vamp-plugins.org/json/schema/enums#/definitions/sample_type" + "$ref": "http://vamp-plugins.org/piper/json/schema/enums#/definitions/sample_type" }, "sampleRate": { "type": "number" diff -r 2ca3f7587550 -r 7913455c77da json/schema/enums.json --- a/json/schema/enums.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/enums.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/enums#", + "id": "http://vamp-plugins.org/piper/json/schema/enums#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for common feature extractor enum types", "definitions": { diff -r 2ca3f7587550 -r 7913455c77da json/schema/error.json --- a/json/schema/error.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/error.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/error#", + "id": "http://vamp-plugins.org/piper/json/schema/error#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for an error object in a response to an rpcrequest", "type": "object", diff -r 2ca3f7587550 -r 7913455c77da json/schema/extractorstaticdata.json --- a/json/schema/extractorstaticdata.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/extractorstaticdata.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/pluginstaticdata#", + "id": "http://vamp-plugins.org/piper/json/schema/pluginstaticdata#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for the static metadata associated with a feature extractor", "type": "object", @@ -8,7 +8,7 @@ "type": "string" }, "basic": { - "$ref": "http://vamp-plugins.org/json/schema/basic#" + "$ref": "http://vamp-plugins.org/piper/json/schema/basic#" }, "maker": { "type": "string" @@ -31,18 +31,18 @@ }, "parameters": { "type": "array", - "items": { "$ref": "http://vamp-plugins.org/json/schema/parameterdescriptor#" } + "items": { "$ref": "http://vamp-plugins.org/piper/json/schema/parameterdescriptor#" } }, "programs": { "type": "array", "items": { "type": "string" } }, "inputDomain": { - "$ref": "http://vamp-plugins.org/json/schema/enums#/definitions/input_domain" + "$ref": "http://vamp-plugins.org/piper/json/schema/enums#/definitions/input_domain" }, "basicOutputInfo": { "type": "array", - "items": { "$ref": "http://vamp-plugins.org/json/schema/basic#" } + "items": { "$ref": "http://vamp-plugins.org/piper/json/schema/basic#" } } }, "required": [ "key", "basic", "version", diff -r 2ca3f7587550 -r 7913455c77da json/schema/feature.json --- a/json/schema/feature.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/feature.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,20 +1,20 @@ { - "id": "http://vamp-plugins.org/json/schema/feature#", + "id": "http://vamp-plugins.org/piper/json/schema/feature#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a single feature returned by a feature extractor", "type": "object", "properties": { "timestamp": { - "$ref": "http://vamp-plugins.org/json/schema/realtime#" + "$ref": "http://vamp-plugins.org/piper/json/schema/realtime#" }, "duration": { - "$ref": "http://vamp-plugins.org/json/schema/realtime#" + "$ref": "http://vamp-plugins.org/piper/json/schema/realtime#" }, "label": { "type": "string" }, "featureValues": { - "$ref": "http://vamp-plugins.org/json/schema/serialisedarray#" + "$ref": "http://vamp-plugins.org/piper/json/schema/serialisedarray#" } }, "additionalProperties": false diff -r 2ca3f7587550 -r 7913455c77da json/schema/featureset.json --- a/json/schema/featureset.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/featureset.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,12 +1,12 @@ { - "id": "http://vamp-plugins.org/json/schema/featureset#", + "id": "http://vamp-plugins.org/piper/json/schema/featureset#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a set of features returned by a feature extractor, associating an output id with an array of features from that output", "type": "object", "patternProperties": { "^[a-zA-Z0-9_-]+$": { "type": "array", - "items": { "$ref": "http://vamp-plugins.org/json/schema/feature#" } + "items": { "$ref": "http://vamp-plugins.org/piper/json/schema/feature#" } } }, "additionalProperties": false diff -r 2ca3f7587550 -r 7913455c77da json/schema/finishrequest.json --- a/json/schema/finishrequest.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/finishrequest.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/finishrequest#", + "id": "http://vamp-plugins.org/piper/json/schema/finishrequest#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a serialised request to finish processing with a feature extractor; may be served in the params field of a finish-method rpcrequest", "type": "object", diff -r 2ca3f7587550 -r 7913455c77da json/schema/finishresponse.json --- a/json/schema/finishresponse.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/finishresponse.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/finishresponse#", + "id": "http://vamp-plugins.org/piper/json/schema/finishresponse#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a successful response to a request to finishing processing with a feature extractor; may be served in the result field of a finish-method rpcresponse", "type": "object", @@ -8,7 +8,7 @@ "type": "number" }, "features": { - "$ref": "http://vamp-plugins.org/json/schema/featureset#" + "$ref": "http://vamp-plugins.org/piper/json/schema/featureset#" } }, "required": [ "handle", "features" ], diff -r 2ca3f7587550 -r 7913455c77da json/schema/listrequest.json --- a/json/schema/listrequest.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/listrequest.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,9 +1,14 @@ { - "id": "http://vamp-plugins.org/json/schema/listrequest#", + "id": "http://vamp-plugins.org/piper/json/schema/listrequest#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a list request for feature extractors; may be served in the params field of a list-method rpcrequest", "type": "object", "properties": { + "from": { + "type": "array", + "items": { "type": "string" } + } }, + "required": [], "additionalProperties": false } diff -r 2ca3f7587550 -r 7913455c77da json/schema/listresponse.json --- a/json/schema/listresponse.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/listresponse.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,12 +1,12 @@ { - "id": "http://vamp-plugins.org/json/schema/listresponse#", + "id": "http://vamp-plugins.org/piper/json/schema/listresponse#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a response to a request to list available feature extractors; may be served in the result field of a list-method rpcresponse", "type": "object", "properties": { "available": { "type": "array", - "items": { "$ref": "http://vamp-plugins.org/json/schema/extractorstaticdata#" } + "items": { "$ref": "http://vamp-plugins.org/piper/json/schema/extractorstaticdata#" } } }, "required": [ "available" ], diff -r 2ca3f7587550 -r 7913455c77da json/schema/loadrequest.json --- a/json/schema/loadrequest.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/loadrequest.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/loadrequest#", + "id": "http://vamp-plugins.org/piper/json/schema/loadrequest#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a request to load a feature extractor; may be served in the params field of a load-method rpcrequest", "type": "object", @@ -13,7 +13,7 @@ "adapterFlags": { "type": "array", "items": { - "$ref": "http://vamp-plugins.org/json/schema/enums#/definitions/adapter_flags" + "$ref": "http://vamp-plugins.org/piper/json/schema/enums#/definitions/adapter_flags" } } }, diff -r 2ca3f7587550 -r 7913455c77da json/schema/loadresponse.json --- a/json/schema/loadresponse.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/loadresponse.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/loadresponse#", + "id": "http://vamp-plugins.org/piper/json/schema/loadresponse#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a successful response to a request to load a feature extractor; may be served in the result field of a load-method rpcresponse", "type": "object", @@ -8,10 +8,10 @@ "type": "number" }, "staticData": { - "$ref": "http://vamp-plugins.org/json/schema/extractorstaticdata#" + "$ref": "http://vamp-plugins.org/piper/json/schema/extractorstaticdata#" }, "defaultConfiguration": { - "$ref": "http://vamp-plugins.org/json/schema/configuration#" + "$ref": "http://vamp-plugins.org/piper/json/schema/configuration#" } }, "required": [ "handle", "staticData", "defaultConfiguration" ], diff -r 2ca3f7587550 -r 7913455c77da json/schema/outputdescriptor.json --- a/json/schema/outputdescriptor.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/outputdescriptor.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,14 +1,14 @@ { - "id": "http://vamp-plugins.org/json/schema/outputdescriptor#", + "id": "http://vamp-plugins.org/piper/json/schema/outputdescriptor#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for an output descriptor belonging to a feature extractor", "type": "object", "properties": { "basic": { - "$ref": "http://vamp-plugins.org/json/schema/basic#" + "$ref": "http://vamp-plugins.org/piper/json/schema/basic#" }, "configured": { - "$ref": "http://vamp-plugins.org/json/schema/configuredoutputdescriptor#" + "$ref": "http://vamp-plugins.org/piper/json/schema/configuredoutputdescriptor#" } }, "required": [ "basic", "configured" ], diff -r 2ca3f7587550 -r 7913455c77da json/schema/parameterdescriptor.json --- a/json/schema/parameterdescriptor.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/parameterdescriptor.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,17 +1,17 @@ { - "id": "http://vamp-plugins.org/json/schema/parameterdescriptor#", + "id": "http://vamp-plugins.org/piper/json/schema/parameterdescriptor#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a metadata about an adjustable parameter of a feature extractor", "type": "object", "properties": { "basic": { - "$ref": "http://vamp-plugins.org/json/schema/basic#" + "$ref": "http://vamp-plugins.org/piper/json/schema/basic#" }, "unit": { "type": "string" }, "extents": { - "$ref": "http://vamp-plugins.org/json/schema/valueextents#" + "$ref": "http://vamp-plugins.org/piper/json/schema/valueextents#" }, "defaultValue": { "type": "number" diff -r 2ca3f7587550 -r 7913455c77da json/schema/processinput.json --- a/json/schema/processinput.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/processinput.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,16 +1,16 @@ { - "id": "http://vamp-plugins.org/json/schema/processinput#", + "id": "http://vamp-plugins.org/piper/json/schema/processinput#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a chunk of input data provided to a process request", "type": "object", "properties": { "timestamp": { - "$ref": "http://vamp-plugins.org/json/schema/realtime#" + "$ref": "http://vamp-plugins.org/piper/json/schema/realtime#" }, "inputBuffers": { "type": "array", "items": { - "$ref": "http://vamp-plugins.org/json/schema/serialisedarray#" + "$ref": "http://vamp-plugins.org/piper/json/schema/serialisedarray#" } } }, diff -r 2ca3f7587550 -r 7913455c77da json/schema/processrequest.json --- a/json/schema/processrequest.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/processrequest.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/processrequest#", + "id": "http://vamp-plugins.org/piper/json/schema/processrequest#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a request to process a chunk of data using a feature extractor; may be served in the params field of a process-method rpcrequest", "type": "object", @@ -8,7 +8,7 @@ "type": "number" }, "processInput": { - "$ref": "http://vamp-plugins.org/json/schema/processinput#" + "$ref": "http://vamp-plugins.org/piper/json/schema/processinput#" } }, "required": [ "handle", "processInput" ], diff -r 2ca3f7587550 -r 7913455c77da json/schema/processresponse.json --- a/json/schema/processresponse.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/processresponse.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/processresponse#", + "id": "http://vamp-plugins.org/piper/json/schema/processresponse#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a successful response to a request to process a chunk of data using a feature extractor; may be served in the result field of a process-method rpcresponse", "type": "object", @@ -8,7 +8,7 @@ "type": "number" }, "features": { - "$ref": "http://vamp-plugins.org/json/schema/featureset#" + "$ref": "http://vamp-plugins.org/piper/json/schema/featureset#" } }, "required": [ "handle", "features" ], diff -r 2ca3f7587550 -r 7913455c77da json/schema/realtime.json --- a/json/schema/realtime.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/realtime.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/realtime#", + "id": "http://vamp-plugins.org/piper/json/schema/realtime#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a timestamp given in seconds and nanoseconds", "type": "object", diff -r 2ca3f7587550 -r 7913455c77da json/schema/rpcrequest.json --- a/json/schema/rpcrequest.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/rpcrequest.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/rpcrequest#", + "id": "http://vamp-plugins.org/piper/json/schema/rpcrequest#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a serialised request compatible with JSON-RPC", "type": "object", @@ -9,11 +9,11 @@ }, "params": { "anyOf": [ - { "$ref": "http://vamp-plugins.org/json/schema/listrequest#" }, - { "$ref": "http://vamp-plugins.org/json/schema/loadrequest#" }, - { "$ref": "http://vamp-plugins.org/json/schema/configurationrequest#" }, - { "$ref": "http://vamp-plugins.org/json/schema/processrequest#" }, - { "$ref": "http://vamp-plugins.org/json/schema/finishrequest#" } + { "$ref": "http://vamp-plugins.org/piper/json/schema/listrequest#" }, + { "$ref": "http://vamp-plugins.org/piper/json/schema/loadrequest#" }, + { "$ref": "http://vamp-plugins.org/piper/json/schema/configurationrequest#" }, + { "$ref": "http://vamp-plugins.org/piper/json/schema/processrequest#" }, + { "$ref": "http://vamp-plugins.org/piper/json/schema/finishrequest#" } ] }, "id": { diff -r 2ca3f7587550 -r 7913455c77da json/schema/rpcresponse.json --- a/json/schema/rpcresponse.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/rpcresponse.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/rpcresponse#", + "id": "http://vamp-plugins.org/piper/json/schema/rpcresponse#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a serialised response to an RPC request; compatible with JSON-RPC, except that the method name must be included here as well as in the request", "type": "object", @@ -10,11 +10,11 @@ }, "result": { "anyOf": [ - { "$ref": "http://vamp-plugins.org/json/schema/listresponse#" }, - { "$ref": "http://vamp-plugins.org/json/schema/loadresponse#" }, - { "$ref": "http://vamp-plugins.org/json/schema/configurationresponse#" }, - { "$ref": "http://vamp-plugins.org/json/schema/processresponse#" }, - { "$ref": "http://vamp-plugins.org/json/schema/finishresponse#" } + { "$ref": "http://vamp-plugins.org/piper/json/schema/listresponse#" }, + { "$ref": "http://vamp-plugins.org/piper/json/schema/loadresponse#" }, + { "$ref": "http://vamp-plugins.org/piper/json/schema/configurationresponse#" }, + { "$ref": "http://vamp-plugins.org/piper/json/schema/processresponse#" }, + { "$ref": "http://vamp-plugins.org/piper/json/schema/finishresponse#" } ] }, "id": { @@ -35,7 +35,7 @@ "type": "string" }, "error": { - "$ref": "http://vamp-plugins.org/json/schema/error#" + "$ref": "http://vamp-plugins.org/piper/json/schema/error#" }, "id": { "anyOf": [ diff -r 2ca3f7587550 -r 7913455c77da json/schema/serialisedarray.json --- a/json/schema/serialisedarray.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/serialisedarray.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/serialisedarray#", + "id": "http://vamp-plugins.org/piper/json/schema/serialisedarray#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for alternate serialisations of an array of floating-point values", "anyOf": [ diff -r 2ca3f7587550 -r 7913455c77da json/schema/valueextents.json --- a/json/schema/valueextents.json Wed Oct 12 12:52:14 2016 +0100 +++ b/json/schema/valueextents.json Fri Nov 04 10:42:55 2016 +0000 @@ -1,5 +1,5 @@ { - "id": "http://vamp-plugins.org/json/schema/valueextents#", + "id": "http://vamp-plugins.org/piper/json/schema/valueextents#", "$schema": "http://json-schema.org/draft-04/schema#", "description": "schema for a structure giving the extents of a value range", "type": "object",