Mercurial > hg > piper

changeset 170:4997e3b4aa54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename away a few more references to plugins
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 06 Oct 2016 14:00:51 +0100
parents bac1098dbd26
children 4c2ff04a89cf
files examples/extractorstaticdata.json examples/listresponse.json examples/loadrequest.json examples/loadresponse.json examples/rpcrequest.json examples/rpcresponse-ok.json schema/extractorstaticdata.json schema/listresponse.json schema/loadrequest.json
diffstat 9 files changed, 26 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/examples/extractorstaticdata.json	Thu Oct 06 13:46:56 2016 +0100
+++ b/examples/extractorstaticdata.json	Thu Oct 06 14:00:51 2016 +0100
@@ -1,1 +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}
+{"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}
--- a/examples/listresponse.json	Thu Oct 06 13:46:56 2016 +0100
+++ b/examples/listresponse.json	Thu Oct 06 14:00:51 2016 +0100
@@ -1,5 +1,5 @@
 {
-    "plugins": [
+    "available": [
         {
             "basic": {
                 "description": "Track the amplitude of the audio signal",
@@ -49,8 +49,8 @@
                     "valueNames": []
                 }
             ],
-            "pluginKey": "vamp-example-plugins:amplitudefollower",
-            "pluginVersion": 1,
+            "key": "vamp-example-plugins:amplitudefollower",
+            "version": 1,
             "programs": []
         },
         {
@@ -136,8 +136,8 @@
                     "valueNames": []
                 }
             ],
-            "pluginKey": "vamp-example-plugins:fixedtempo",
-            "pluginVersion": 1,
+            "key": "vamp-example-plugins:fixedtempo",
+            "version": 1,
             "programs": []
         },
         {
@@ -194,8 +194,8 @@
                     "valueNames": []
                 }
             ],
-            "pluginKey": "vamp-example-plugins:percussiononsets",
-            "pluginVersion": 2,
+            "key": "vamp-example-plugins:percussiononsets",
+            "version": 2,
             "programs": []
         },
         {
@@ -218,8 +218,8 @@
             "maxChannelCount": 1,
             "minChannelCount": 1,
             "parameters": [],
-            "pluginKey": "vamp-example-plugins:powerspectrum",
-            "pluginVersion": 1,
+            "key": "vamp-example-plugins:powerspectrum",
+            "version": 1,
             "programs": []
         },
         {
@@ -247,8 +247,8 @@
             "maxChannelCount": 1,
             "minChannelCount": 1,
             "parameters": [],
-            "pluginKey": "vamp-example-plugins:spectralcentroid",
-            "pluginVersion": 2,
+            "key": "vamp-example-plugins:spectralcentroid",
+            "version": 2,
             "programs": []
         },
         {
@@ -276,8 +276,8 @@
             "maxChannelCount": 1,
             "minChannelCount": 1,
             "parameters": [],
-            "pluginKey": "vamp-example-plugins:zerocrossing",
-            "pluginVersion": 2,
+            "key": "vamp-example-plugins:zerocrossing",
+            "version": 2,
             "programs": []
         }
     ]
--- a/examples/loadrequest.json	Thu Oct 06 13:46:56 2016 +0100
+++ b/examples/loadrequest.json	Thu Oct 06 14:00:51 2016 +0100
@@ -1,1 +1,1 @@
-{"pluginKey":"vamp-example-plugins:percussiononsets","inputSampleRate":44100,"adapterFlags":["AdaptInputDomain","AdaptBufferSize"]}
+{"key":"vamp-example-plugins:percussiononsets","inputSampleRate":44100,"adapterFlags":["AdaptInputDomain","AdaptBufferSize"]}
--- a/examples/loadresponse.json	Thu Oct 06 13:46:56 2016 +0100
+++ b/examples/loadresponse.json	Thu Oct 06 14:00:51 2016 +0100
@@ -1,1 +1,1 @@
-{"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}}
+{"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", "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},"defaultConfiguration":{"blockSize": 512, "channelCount": 2, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 1024}}
--- a/examples/rpcrequest.json	Thu Oct 06 13:46:56 2016 +0100
+++ b/examples/rpcrequest.json	Thu Oct 06 14:00:51 2016 +0100
@@ -1,2 +1,2 @@
-{"method": "load", "params": {"pluginKey":"vamp-example-plugins:percussiononsets","inputSampleRate":44100,"adapterFlags":["AdaptInputDomain","AdaptBufferSize"]}, "id": 6, "jsonrpc": "2.0"}
+{"method": "load", "params": {"key":"vamp-example-plugins:percussiononsets","inputSampleRate":44100,"adapterFlags":["AdaptInputDomain","AdaptBufferSize"]}, "id": 6, "jsonrpc": "2.0"}
 
--- a/examples/rpcresponse-ok.json	Thu Oct 06 13:46:56 2016 +0100
+++ b/examples/rpcresponse-ok.json	Thu Oct 06 14:00:51 2016 +0100
@@ -1,1 +1,1 @@
-{"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"}
+{"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", "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},"defaultConfiguration":{"blockSize": 512, "channelCount": 2, "parameterValues": {"sensitivity": 40, "threshold": 3}, "stepSize": 1024}},"id": "6"}
--- a/schema/extractorstaticdata.json	Thu Oct 06 13:46:56 2016 +0100
+++ b/schema/extractorstaticdata.json	Thu Oct 06 14:00:51 2016 +0100
@@ -4,7 +4,7 @@
     "description": "schema for the static metadata associated with a feature extractor",
     "type": "object",
     "properties": {
-	"pluginKey": {
+	"key": {
 	    "type": "string"
 	},
 	"basic": {
@@ -16,7 +16,7 @@
 	"copyright": {
 	    "type": "string"
 	},
-	"pluginVersion": {
+	"version": {
 	    "type": "integer"
 	},
 	"category": {
@@ -45,7 +45,7 @@
 	    "items": { "$ref": "http://vamp-plugins.org/json/schema/basic#" }
 	}
     },
-    "required": [ "pluginKey", "basic", "pluginVersion",
+    "required": [ "key", "basic", "version",
 		  "minChannelCount", "maxChannelCount",
 		  "inputDomain", "basicOutputInfo" ],
     "additionalProperties": false
--- a/schema/listresponse.json	Thu Oct 06 13:46:56 2016 +0100
+++ b/schema/listresponse.json	Thu Oct 06 14:00:51 2016 +0100
@@ -1,14 +1,14 @@
 {
     "id": "http://vamp-plugins.org/json/schema/listresponse#",
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "description": "schema for a response to a request to list feature extractors; may be served in the result field of a list-method rpcresponse",
+    "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": {
-	"plugins": {
+	"available": {
             "type": "array",
             "items": { "$ref": "http://vamp-plugins.org/json/schema/extractorstaticdata#" }
 	}
     },
-    "required": [ "plugins" ],
+    "required": [ "available" ],
     "additionalProperties": false
 }
--- a/schema/loadrequest.json	Thu Oct 06 13:46:56 2016 +0100
+++ b/schema/loadrequest.json	Thu Oct 06 14:00:51 2016 +0100
@@ -4,7 +4,7 @@
     "description": "schema for a request to load a feature extractor; may be served in the params field of a load-method rpcrequest",
     "type": "object",
     "properties": {
-	"pluginKey": {
+	"key": {
 	    "type": "string"
 	},
 	"inputSampleRate": {
@@ -17,7 +17,7 @@
 	    }
 	}
     },
-    "required": [ "pluginKey", "inputSampleRate" ],
+    "required": [ "key", "inputSampleRate" ],
     "additionalProperties": false
 }