diff perf-test-node.js @ 110:2f621b00747e

Merge from branch jsonrpc

--- a/perf-test-node.js	Fri Sep 30 19:20:23 2016 +0100
+++ b/perf-test-node.js	Thu Oct 06 14:33:12 2016 +0100
@@ -54,7 +54,7 @@
     }
     
     const responseJson = vampipeProcessRaw(
-        request.pluginHandle,
+        request.handle,
         buffersPtr,
         request.processInput.timestamp.s,
         request.processInput.timestamp.n);
@@ -138,7 +138,7 @@
 
 function responseToFeatureSet(response) {
     const features = new Map();
-    const processResponse = response.content;
+    const processResponse = response.result;
     const wireFeatures = processResponse.features;
     Object.keys(wireFeatures).forEach(key => {
         return features.set(key, convertWireFeatureList(wireFeatures[key]));
@@ -151,11 +151,11 @@
     const rate = 44100;
     
     comment("Loading zero crossings plugin...");
-    let result = request('{"type":"load","content": {"pluginKey":"vamp-example-plugins:zerocrossing","inputSampleRate":' + rate + ',"adapterFlags":["AdaptAllSafe"]}}');
+    let result = request('{"method":"load","params": {"key":"vamp-example-plugins:zerocrossing","inputSampleRate":' + rate + ',"adapterFlags":["AdaptAllSafe"]}}');
 
     const blockSize = 1024;
 
-    result = request('{"type":"configure","content":{"pluginHandle":1,"configuration":{"blockSize": ' + blockSize + ', "channelCount": 1, "stepSize": ' + blockSize + '}}}');
+    result = request('{"method":"configure","params":{"handle":1,"configuration":{"blockSize": ' + blockSize + ', "channelCount": 1, "stepSize": ' + blockSize + '}}}');
 
     const nblocks = 1000;
 
@@ -180,7 +180,7 @@
     
     for (let i = 0; i < nblocks; ++i) {
 	result = processRaw({
-	    "pluginHandle": 1,
+	    "handle": 1,
 	    "processInput": blocks[i]
 	});
         let features = responseToFeatureSet(result);
@@ -202,7 +202,7 @@
     
     for (let i = 0; i < nblocks; ++i) {
 	result = processRaw({
-	    "pluginHandle": 1,
+	    "handle": 1,
 	    "processInput": blocks[i]
 	});
         let features = responseToFeatureSet(result);
@@ -216,7 +216,7 @@
     comment("Total = " + total);
     
     comment("Cleaning up the plugin and getting any remaining features...");
-    result = request('{"type":"finish","content":{"pluginHandle":1}}');
+    result = request('{"method":"finish","params":{"handle":1}}');
 }
 
 test();