# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1474292923 -3600
# Node ID 83167b54c8a7da705a9188dc393ef2af8ab93eb0
# Parent  7d251702566e4c08da0905e7997df9cd89fe2c66# Parent  a9a8dce4bcdaa8f8cc24a6bd41b99244347f672e
Merge from branch outputid-string-in-featureset

diff -r 7d251702566e -r 83167b54c8a7 capnproto/vamp.capnp
--- a/capnproto/vamp.capnp	Mon May 23 16:09:25 2016 +0100
+++ b/capnproto/vamp.capnp	Mon Sep 19 14:48:43 2016 +0100
@@ -96,7 +96,7 @@
 
 struct FeatureSet {
     struct FSPair {
-        output         @0  :Int32;
+        output         @0  :Text;
         features       @1  :List(Feature) = [];
     }
     featurePairs       @0  :List(FSPair);
@@ -136,7 +136,8 @@
 }
 
 struct ConfigurationResponse {
-    outputs            @0  :List(OutputDescriptor);
+    pluginHandle       @0  :Int32;
+    outputs            @1  :List(OutputDescriptor);
 }
 
 struct ProcessRequest {
@@ -144,14 +145,15 @@
     input              @1  :ProcessInput;
 }
 
+struct ProcessResponse {
+    pluginHandle       @0  :Int32;
+    features           @1  :FeatureSet;
+}
+
 struct FinishRequest {
     pluginHandle       @0  :Int32;
 }
 
-struct ProcessResponse {
-    features           @0  :FeatureSet;
-}
-
 struct VampRequest {
     request :union {
 	list           @0  :Void;