# HG changeset patch
# User Chris Cannam
# Date 1475686858 -3600
# Node ID a9dbf9f458961853e3f0e48ea5b647b2bcf319f1
# Parent  946c965fd1eb27b99badcabd922d42e6733fccb1
Update adapter code

diff -r 946c965fd1eb -r a9dbf9f45896 VamPipePluginLibrary.cpp
--- a/VamPipePluginLibrary.cpp	Fri Sep 30 19:20:23 2016 +0100
+++ b/VamPipePluginLibrary.cpp	Wed Oct 05 18:00:58 2016 +0100
@@ -54,10 +54,6 @@
     }
     if (!j.is_object()) {
 	err = "object expected at top level";
-    } else if (!j["type"].is_string()) {
-	err = "string expected for type field";
-    } else if (!j["content"].is_null() && !j["content"].is_object()) {
-	err = "object expected for content field";
     }
     return j;
 }
diff -r 946c965fd1eb -r a9dbf9f45896 quick-test.cpp
--- a/quick-test.cpp	Fri Sep 30 19:20:23 2016 +0100
+++ b/quick-test.cpp	Wed Oct 05 18:00:58 2016 +0100
@@ -30,32 +30,32 @@
 	return 1;
     }
 
-    string listRequest = "{\"type\": \"list\"}";
+    string listRequest = "{\"method\": \"list\"}";
     const char *listResponse = reqFn(listRequest.c_str());
     cout << listResponse << endl;
     freeFn(listResponse);
 
-    string loadRequest = "{\"type\":\"load\",\"content\": {\"pluginKey\":\"vamp-example-plugins:powerspectrum\",\"inputSampleRate\":44100,\"adapterFlags\":[\"AdaptAllSafe\"]}}";
+    string loadRequest = "{\"method\":\"load\",\"params\": {\"pluginKey\":\"vamp-example-plugins:powerspectrum\",\"inputSampleRate\":44100,\"adapterFlags\":[\"AdaptAllSafe\"]}}";
     const char *loadResponse = reqFn(loadRequest.c_str());
     cout << loadResponse << endl;
     freeFn(loadResponse);
 
-    string configRequest = "{\"type\":\"configure\",\"content\":{\"pluginHandle\":1,\"configuration\":{\"blockSize\":8,\"channelCount\":1,\"stepSize\":8}}}";
+    string configRequest = "{\"method\":\"configure\",\"params\":{\"pluginHandle\":1,\"configuration\":{\"blockSize\":8,\"channelCount\":1,\"stepSize\":8}}}";
     const char *configResponse = reqFn(configRequest.c_str());
     cout << configResponse << endl;
     freeFn(configResponse);
 
-    string processRequest = "{\"type\":\"process\",\"content\":{\"pluginHandle\":1,\"processInput\":{\"timestamp\":{\"s\":0,\"n\":0},\"inputBuffers\":[[0,1,0,-1,0,1,0,-1]]}}}";
+    string processRequest = "{\"method\":\"process\",\"params\":{\"pluginHandle\":1,\"processInput\":{\"timestamp\":{\"s\":0,\"n\":0},\"inputBuffers\":[[0,1,0,-1,0,1,0,-1]]}}}";
     const char *processResponse = reqFn(processRequest.c_str());
     cout << processResponse << endl;
     freeFn(processResponse);
 
-    string b64processRequest = "{\"type\":\"process\",\"content\":{\"pluginHandle\":1,\"processInput\":{\"timestamp\":{\"s\":0,\"n\":0},\"inputBuffers\":[\"AAAAAAAAgD8AAAAAAACAvwAAAAAAAIA/AAAAAAAAgL8\"]}}}";
+    string b64processRequest = "{\"method\":\"process\",\"params\":{\"pluginHandle\":1,\"processInput\":{\"timestamp\":{\"s\":0,\"n\":0},\"inputBuffers\":[\"AAAAAAAAgD8AAAAAAACAvwAAAAAAAIA/AAAAAAAAgL8\"]}}}";
     const char *b64processResponse = reqFn(b64processRequest.c_str());
     cout << b64processResponse << endl;
     freeFn(b64processResponse);
     
-    string finishRequest = "{\"type\":\"finish\",\"content\":{\"pluginHandle\":1}}";
+    string finishRequest = "{\"method\":\"finish\",\"params\":{\"pluginHandle\":1}}";
     const char *finishResponse = reqFn(finishRequest.c_str());
     cout << finishResponse << endl;
     freeFn(finishResponse);