Mercurial > hg > piper

changeset 12:bae6b03e1271

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch outputid-string-in-featureset
author Chris Cannam
date Mon, 19 Sep 2016 14:48:43 +0100
parents d6725f1c323c (current diff) f6aae477b30f (diff)
children 16307ce446e2 d0016e997a82
files
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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;