# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1475847949 -3600
# Node ID 5cd428fc703cd231a97b38ee1dff6615e514d088
# Parent  7fa34d4318064c51aa1072f2bdb3b7d2ff3f6dc9
Renames

diff -r 7fa34d431806 -r 5cd428fc703c capnproto/piper.capnp
--- a/capnproto/piper.capnp	Fri Oct 07 14:27:11 2016 +0100
+++ b/capnproto/piper.capnp	Fri Oct 07 14:45:49 2016 +0100
@@ -4,34 +4,6 @@
 using Cxx = import "/capnp/c++.capnp";
 $Cxx.namespace("piper");
 
-enum InputDomain {
-    timeDomain         @0;
-    frequencyDomain    @1;
-}
-
-enum SampleType {
-    oneSamplePerStep   @0;
-    fixedSampleRate    @1;
-    variableSampleRate @2;
-}
-
-enum AdapterFlag {
-    adaptInputDomain   @0;
-    adaptChannelCount  @1;
-    adaptBufferSize    @2;
-}
-
-const adaptAllSafe :List(AdapterFlag) =
-      [ adaptInputDomain, adaptChannelCount ];
-
-const adaptAll :List(AdapterFlag) =
-      [ adaptInputDomain, adaptChannelCount, adaptBufferSize ];
-
-struct RealTime {
-    sec                @0  :Int32       = 0;
-    nsec               @1  :Int32       = 0;
-}
-
 struct Basic {
     identifier         @0  :Text;
     name               @1  :Text;
@@ -49,6 +21,12 @@
     valueNames         @7  :List(Text)  = [];
 }
 
+enum SampleType {
+    oneSamplePerStep   @0;
+    fixedSampleRate    @1;
+    variableSampleRate @2;
+}
+
 struct ConfiguredOutputDescriptor {
     unit               @0  :Text;
     hasFixedBinCount   @1  :Bool        = false;
@@ -69,6 +47,11 @@
     configured         @1  :ConfiguredOutputDescriptor;
 }
 
+enum InputDomain {
+    timeDomain         @0;
+    frequencyDomain    @1;
+}
+
 struct ExtractorStaticData {
     key                @0  :Text;
     basic              @1  :Basic;
@@ -84,6 +67,11 @@
     basicOutputInfo    @11 :List(Basic);
 }
 
+struct RealTime {
+    sec                @0  :Int32       = 0;
+    nsec               @1  :Int32       = 0;
+}
+
 struct ProcessInput {
     inputBuffers       @0  :List(List(Float32));
     timestamp          @1  :RealTime;
@@ -118,6 +106,18 @@
     blockSize          @4  :Int32;
 }
 
+enum AdapterFlag {
+    adaptInputDomain   @0;
+    adaptChannelCount  @1;
+    adaptBufferSize    @2;
+}
+
+const adaptAllSafe :List(AdapterFlag) =
+      [ adaptInputDomain, adaptChannelCount ];
+
+const adaptAll :List(AdapterFlag) =
+      [ adaptInputDomain, adaptChannelCount, adaptBufferSize ];
+
 struct ListRequest {
 }
 
@@ -173,7 +173,7 @@
 
 struct RpcRequest {
     # Request bundle for use when using Cap'n Proto serialisation without
-    # Cap'n Proto RPC layer.
+    # Cap'n Proto RPC layer. For Cap'n Proto RPC, see piper.rpc.capnp.
     request :union {
 	list           @0  :ListRequest;
 	load           @1  :LoadRequest;
@@ -185,7 +185,7 @@
 
 struct RpcResponse {
     # Response bundle for use when using Cap'n Proto serialisation without
-    # Cap'n Proto RPC layer.
+    # Cap'n Proto RPC layer. For Cap'n Proto RPC, see piper.rpc.capnp.
     response :union {
         error          @0  :Error;
 	list           @1  :ListResponse;
diff -r 7fa34d431806 -r 5cd428fc703c capnproto/piper.rpc.capnp
--- a/capnproto/piper.rpc.capnp	Fri Oct 07 14:27:11 2016 +0100
+++ b/capnproto/piper.rpc.capnp	Fri Oct 07 14:45:49 2016 +0100
@@ -7,10 +7,10 @@
 
 interface Piper {
     # RPC interface for use when using Cap'n Proto RPC layer.
-    list               @0 (req :P.ListRequest) -> (resp :P.ListResponse);
-    load               @1 (req :P.LoadRequest) -> (resp :P.LoadResponse);
-    configure          @2 (req :P.ConfigurationRequest) -> (resp :P.ConfigurationResponse);
-    process            @3 (req :P.ProcessRequest) -> (resp :P.ProcessResponse);
-    finish             @4 (req :P.FinishRequest) -> (resp :P.FinishResponse);
+    list       @0 (listRequest :P.ListRequest) -> (listResponse :P.ListResponse);
+    load       @1 (loadRequest :P.LoadRequest) -> (loadResponse :P.LoadResponse);
+    configure  @2 (configurationRequest :P.ConfigurationRequest) -> (configurationResponse :P.ConfigurationResponse);
+    process    @3 (processRequest :P.ProcessRequest) -> (processResponse :P.ProcessResponse);
+    finish     @4 (finishRequest :P.FinishRequest) -> (finishResponse :P.FinishResponse);
 }