changeset 43:6ed502816e14

Change some names to harmonise better with SDK
author Chris Cannam
date Thu, 12 May 2016 12:26:29 +0100
parents 584639293a76
children cd135b833191
files examples/loadrequest.json examples/pluginstaticdata.json schema/loadrequest.json schema/pluginstaticdata.json
diffstat 4 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/examples/loadrequest.json	Wed May 11 13:59:23 2016 +0100
+++ b/examples/loadrequest.json	Thu May 12 12:26:29 2016 +0100
@@ -1,1 +1,1 @@
-{"key":"vamp-example-plugins:percussiononsets","inputSampleRate":44100,"adapterFlags":["AdaptInputDomain","AdaptBufferSize"]}
+{"pluginKey":"vamp-example-plugins:percussiononsets","inputSampleRate":44100,"adapterFlags":["AdaptInputDomain","AdaptBufferSize"]}
--- a/examples/pluginstaticdata.json	Wed May 11 13:59:23 2016 +0100
+++ b/examples/pluginstaticdata.json	Thu May 12 12:26:29 2016 +0100
@@ -1,2 +1,2 @@
 
-{"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", "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}
+{"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/schema/loadrequest.json	Wed May 11 13:59:23 2016 +0100
+++ b/schema/loadrequest.json	Thu May 12 12:26:29 2016 +0100
@@ -4,7 +4,7 @@
     "description": "schema for a serialised load request for a Vamp Plugin; normally served as the content field of an object matching the plain request schema",
     "type": "object",
     "properties": {
-	"key": {
+	"pluginKey": {
 	    "type": "string"
 	},
 	"inputSampleRate": {
@@ -17,7 +17,7 @@
 	    }
 	}
     },
-    "required": [ "key", "inputSampleRate" ],
+    "required": [ "pluginKey", "inputSampleRate" ],
     "additionalProperties": false
 }
 
--- a/schema/pluginstaticdata.json	Wed May 11 13:59:23 2016 +0100
+++ b/schema/pluginstaticdata.json	Thu May 12 12:26:29 2016 +0100
@@ -4,7 +4,7 @@
     "description": "schema for a serialised bundle of the static data associated with a Vamp Plugin",
     "type": "object",
     "properties": {
-	"key": {
+	"pluginKey": {
 	    "type": "string"
 	},
 	"basic": {
@@ -16,7 +16,7 @@
 	"copyright": {
 	    "type": "string"
 	},
-	"version": {
+	"pluginVersion": {
 	    "type": "integer"
 	},
 	"category": {
@@ -45,7 +45,7 @@
 	    "items": { "$ref": "http://vamp-plugins.org/json/schema/basic#" }
 	}
     },
-    "required": [ "key", "basic", "version",
+    "required": [ "pluginKey", "basic", "pluginVersion",
 		  "minChannelCount", "maxChannelCount",
 		  "inputDomain", "basicOutputInfo" ],
     "additionalProperties": false