Mercurial > hg > piper
changeset 160:45fa68ee83ce
Remove the term "plugin" in various places
author | Chris Cannam <c.cannam@qmul.ac.uk> |
---|---|
date | Thu, 06 Oct 2016 13:38:16 +0100 |
parents | a99929c1df42 |
children | bac1098dbd26 |
files | examples/configuration.json examples/configurationrequest.json examples/extractorstaticdata.json examples/finishrequest.json examples/finishresponse.json examples/loadresponse.json examples/pluginconfiguration.json examples/pluginstaticdata.json examples/processrequest.json examples/processresponse.json examples/rpcresponse-ok.json schema/configuration.json schema/configurationrequest.json schema/configurationresponse.json schema/extractorstaticdata.json schema/finishrequest.json schema/finishresponse.json schema/listresponse.json schema/loadresponse.json schema/pluginconfiguration.json schema/pluginstaticdata.json schema/processrequest.json schema/processresponse.json |
diffstat | 23 files changed, 110 insertions(+), 110 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/configuration.json Thu Oct 06 13:38:16 2016 +0100 @@ -0,0 +1,1 @@ +{"blockSize": 512, "channelCount": 2, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 1024}
--- a/examples/configurationrequest.json Thu Oct 06 12:12:41 2016 +0100 +++ b/examples/configurationrequest.json Thu Oct 06 13:38:16 2016 +0100 @@ -1,1 +1,1 @@ -{"pluginHandle":12345,"configuration":{"blockSize": 512, "channelCount": 2, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 1024}} +{"handle":12345,"configuration":{"blockSize": 512, "channelCount": 2, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 1024}}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/examples/extractorstaticdata.json Thu Oct 06 13:38:16 2016 +0100 @@ -0,0 +1,1 @@ +{"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": "FrequencyDomain", "pluginKey": "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": [], "pluginVersion": 2}
--- a/examples/finishrequest.json Thu Oct 06 12:12:41 2016 +0100 +++ b/examples/finishrequest.json Thu Oct 06 13:38:16 2016 +0100 @@ -1,1 +1,1 @@ -{"pluginHandle": 1} +{"handle": 1}
--- a/examples/finishresponse.json Thu Oct 06 12:12:41 2016 +0100 +++ b/examples/finishresponse.json Thu Oct 06 13:38:16 2016 +0100 @@ -1,2 +1,2 @@ -{"pluginHandle":12345,"features":{"outputid": [{"featureValues": [1,2,3], "timestamp": {"n": 141590000, "s": 3}}]}} +{"handle":12345,"features":{"outputid": [{"featureValues": [1,2,3], "timestamp": {"n": 141590000, "s": 3}}]}}
--- a/examples/loadresponse.json Thu Oct 06 12:12:41 2016 +0100 +++ b/examples/loadresponse.json Thu Oct 06 13:38:16 2016 +0100 @@ -1,1 +1,1 @@ -{"pluginHandle":12345,"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": "FrequencyDomain", "pluginKey": "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": [], "pluginVersion": 2},"defaultConfiguration":{"blockSize": 512, "channelCount": 2, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 1024}} +{"handle":12345,"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": "FrequencyDomain", "pluginKey": "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": [], "pluginVersion": 2},"defaultConfiguration":{"blockSize": 512, "channelCount": 2, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 1024}}
--- a/examples/pluginconfiguration.json Thu Oct 06 12:12:41 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -{"blockSize": 512, "channelCount": 2, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 1024}
--- a/examples/pluginstaticdata.json Thu Oct 06 12:12:41 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -{"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": "FrequencyDomain", "pluginKey": "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": [], "pluginVersion": 2}
--- a/examples/processrequest.json Thu Oct 06 12:12:41 2016 +0100 +++ b/examples/processrequest.json Thu Oct 06 13:38:16 2016 +0100 @@ -1,1 +1,1 @@ -{"pluginHandle":12345,"processInput":{"inputBuffers":["AACAPwAAAEAEAEBAAACAQAAAoEAAAMBAAADQQAAA4EA"], "timestamp": {"n": 141590000, "s": 3}}} +{"handle":12345,"processInput":{"inputBuffers":["AACAPwAAAEAEAEBAAACAQAAAoEAAAMBAAADQQAAA4EA"], "timestamp": {"n": 141590000, "s": 3}}}
--- a/examples/processresponse.json Thu Oct 06 12:12:41 2016 +0100 +++ b/examples/processresponse.json Thu Oct 06 13:38:16 2016 +0100 @@ -1,2 +1,2 @@ -{"pluginHandle":12345,"features":{"outputid": [{"featureValues": "AACAPwAAAEAEAEBAAACAQAAAoEAAAMBAAADQQAAA4EA", "label": "A feature", "timestamp": {"n": 141590000, "s": 3}}]}} +{"handle":12345,"features":{"outputid": [{"featureValues": "AACAPwAAAEAEAEBAAACAQAAAoEAAAMBAAADQQAAA4EA", "label": "A feature", "timestamp": {"n": 141590000, "s": 3}}]}}
--- a/examples/rpcresponse-ok.json Thu Oct 06 12:12:41 2016 +0100 +++ b/examples/rpcresponse-ok.json Thu Oct 06 13:38:16 2016 +0100 @@ -1,1 +1,1 @@ -{"method": "load", "result": {"pluginHandle":12345,"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": "FrequencyDomain", "pluginKey": "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": [], "pluginVersion": 2},"defaultConfiguration":{"blockSize": 512, "channelCount": 2, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 1024}},"id": "6"} +{"method": "load", "result": {"handle":12345,"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": "FrequencyDomain", "pluginKey": "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": [], "pluginVersion": 2},"defaultConfiguration":{"blockSize": 512, "channelCount": 2, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 1024}},"id": "6"}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/configuration.json Thu Oct 06 13:38:16 2016 +0100 @@ -0,0 +1,32 @@ +{ + "id": "http://vamp-plugins.org/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", + "properties": { + "parameterValues": { + "type": "object", + "patternProperties": { + "^[a-zA-Z0-9_-]+$": { + "type": "number" + } + }, + "additionalProperties": false + }, + "currentProgram": { + "type": "string" + }, + "channelCount": { + "type": "integer" + }, + "stepSize": { + "type": "integer" + }, + "blockSize": { + "type": "integer" + } + }, + "required": [ "channelCount", "stepSize", "blockSize" ], + "additionalProperties": false +} +
--- a/schema/configurationrequest.json Thu Oct 06 12:12:41 2016 +0100 +++ b/schema/configurationrequest.json Thu Oct 06 13:38:16 2016 +0100 @@ -4,14 +4,14 @@ "description": "schema for a request to configure a feature extractor; may be served in the params field of a configure-method rpcrequest", "type": "object", "properties": { - "pluginHandle": { + "handle": { "type": "number" }, "configuration": { - "$ref": "http://vamp-plugins.org/json/schema/pluginconfiguration#" + "$ref": "http://vamp-plugins.org/json/schema/configuration#" } }, - "required": [ "pluginHandle", "configuration" ], + "required": [ "handle", "configuration" ], "additionalProperties": false }
--- a/schema/configurationresponse.json Thu Oct 06 12:12:41 2016 +0100 +++ b/schema/configurationresponse.json Thu Oct 06 13:38:16 2016 +0100 @@ -4,7 +4,7 @@ "description": "schema for a response to a request to configure a feature extractor; may be served in the result field of a configure-method rpcresponse", "type": "object", "properties": { - "pluginHandle": { + "handle": { "type": "number" }, "outputList": {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/extractorstaticdata.json Thu Oct 06 13:38:16 2016 +0100 @@ -0,0 +1,53 @@ +{ + "id": "http://vamp-plugins.org/json/schema/pluginstaticdata#", + "$schema": "http://json-schema.org/draft-04/schema#", + "description": "schema for the static metadata associated with a feature extractor", + "type": "object", + "properties": { + "pluginKey": { + "type": "string" + }, + "basic": { + "$ref": "http://vamp-plugins.org/json/schema/basic#" + }, + "maker": { + "type": "string" + }, + "copyright": { + "type": "string" + }, + "pluginVersion": { + "type": "integer" + }, + "category": { + "type": "array", + "items": { "type": "string" } + }, + "minChannelCount": { + "type": "integer" + }, + "maxChannelCount": { + "type": "integer" + }, + "parameters": { + "type": "array", + "items": { "$ref": "http://vamp-plugins.org/json/schema/parameterdescriptor#" } + }, + "programs": { + "type": "array", + "items": { "type": "string" } + }, + "inputDomain": { + "$ref": "http://vamp-plugins.org/json/schema/enums#/definitions/input_domain" + }, + "basicOutputInfo": { + "type": "array", + "items": { "$ref": "http://vamp-plugins.org/json/schema/basic#" } + } + }, + "required": [ "pluginKey", "basic", "pluginVersion", + "minChannelCount", "maxChannelCount", + "inputDomain", "basicOutputInfo" ], + "additionalProperties": false +} +
--- a/schema/finishrequest.json Thu Oct 06 12:12:41 2016 +0100 +++ b/schema/finishrequest.json Thu Oct 06 13:38:16 2016 +0100 @@ -4,10 +4,10 @@ "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", "properties": { - "pluginHandle": { + "handle": { "type": "number" } }, - "required": [ "pluginHandle" ], + "required": [ "handle" ], "additionalProperties": false }
--- a/schema/finishresponse.json Thu Oct 06 12:12:41 2016 +0100 +++ b/schema/finishresponse.json Thu Oct 06 13:38:16 2016 +0100 @@ -4,14 +4,14 @@ "description": "schema for a 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", "properties": { - "pluginHandle": { + "handle": { "type": "number" }, "features": { "$ref": "http://vamp-plugins.org/json/schema/featureset#" } }, - "required": [ "pluginHandle", "features" ], + "required": [ "handle", "features" ], "additionalProperties": false }
--- a/schema/listresponse.json Thu Oct 06 12:12:41 2016 +0100 +++ b/schema/listresponse.json Thu Oct 06 13:38:16 2016 +0100 @@ -6,7 +6,7 @@ "properties": { "plugins": { "type": "array", - "items": { "$ref": "http://vamp-plugins.org/json/schema/pluginstaticdata#" } + "items": { "$ref": "http://vamp-plugins.org/json/schema/extractorstaticdata#" } } }, "required": [ "plugins" ],
--- a/schema/loadresponse.json Thu Oct 06 12:12:41 2016 +0100 +++ b/schema/loadresponse.json Thu Oct 06 13:38:16 2016 +0100 @@ -4,14 +4,14 @@ "description": "schema for a response to a request to load a feature extractor; may be served in the result field of a load-method rpcresponse", "type": "object", "properties": { - "pluginHandle": { + "handle": { "type": "number" }, "staticData": { - "$ref": "http://vamp-plugins.org/json/schema/pluginstaticdata#" + "$ref": "http://vamp-plugins.org/json/schema/extractorstaticdata#" }, "defaultConfiguration": { - "$ref": "http://vamp-plugins.org/json/schema/pluginconfiguration#" + "$ref": "http://vamp-plugins.org/json/schema/configuration#" } }, "additionalProperties": false
--- a/schema/pluginconfiguration.json Thu Oct 06 12:12:41 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -{ - "id": "http://vamp-plugins.org/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", - "properties": { - "parameterValues": { - "type": "object", - "patternProperties": { - "^[a-zA-Z0-9_-]+$": { - "type": "number" - } - }, - "additionalProperties": false - }, - "currentProgram": { - "type": "string" - }, - "channelCount": { - "type": "integer" - }, - "stepSize": { - "type": "integer" - }, - "blockSize": { - "type": "integer" - } - }, - "required": [ "channelCount", "stepSize", "blockSize" ], - "additionalProperties": false -} -
--- a/schema/pluginstaticdata.json Thu Oct 06 12:12:41 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -{ - "id": "http://vamp-plugins.org/json/schema/pluginstaticdata#", - "$schema": "http://json-schema.org/draft-04/schema#", - "description": "schema for the static metadata associated with a feature extractor", - "type": "object", - "properties": { - "pluginKey": { - "type": "string" - }, - "basic": { - "$ref": "http://vamp-plugins.org/json/schema/basic#" - }, - "maker": { - "type": "string" - }, - "copyright": { - "type": "string" - }, - "pluginVersion": { - "type": "integer" - }, - "category": { - "type": "array", - "items": { "type": "string" } - }, - "minChannelCount": { - "type": "integer" - }, - "maxChannelCount": { - "type": "integer" - }, - "parameters": { - "type": "array", - "items": { "$ref": "http://vamp-plugins.org/json/schema/parameterdescriptor#" } - }, - "programs": { - "type": "array", - "items": { "type": "string" } - }, - "inputDomain": { - "$ref": "http://vamp-plugins.org/json/schema/enums#/definitions/input_domain" - }, - "basicOutputInfo": { - "type": "array", - "items": { "$ref": "http://vamp-plugins.org/json/schema/basic#" } - } - }, - "required": [ "pluginKey", "basic", "pluginVersion", - "minChannelCount", "maxChannelCount", - "inputDomain", "basicOutputInfo" ], - "additionalProperties": false -} -
--- a/schema/processrequest.json Thu Oct 06 12:12:41 2016 +0100 +++ b/schema/processrequest.json Thu Oct 06 13:38:16 2016 +0100 @@ -4,14 +4,14 @@ "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", "properties": { - "pluginHandle": { + "handle": { "type": "number" }, "processInput": { "$ref": "http://vamp-plugins.org/json/schema/processinput#" } }, - "required": [ "pluginHandle", "processInput" ], + "required": [ "handle", "processInput" ], "additionalProperties": false }
--- a/schema/processresponse.json Thu Oct 06 12:12:41 2016 +0100 +++ b/schema/processresponse.json Thu Oct 06 13:38:16 2016 +0100 @@ -4,14 +4,14 @@ "description": "schema for a 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", "properties": { - "pluginHandle": { + "handle": { "type": "number" }, "features": { "$ref": "http://vamp-plugins.org/json/schema/featureset#" } }, - "required": [ "pluginHandle", "features" ], + "required": [ "handle", "features" ], "additionalProperties": false }