diff vamp-capnp/VampnProto.h @ 188:90c962b68d7f

Merge pull request #2 from piper-audio/dev/step-and-block-size

Pull step & block size out into framing struct, return in config

--- a/vamp-capnp/VampnProto.h	Fri Feb 03 13:00:42 2017 +0000
+++ b/vamp-capnp/VampnProto.h	Mon Feb 06 12:04:25 2017 +0000
@@ -477,8 +477,10 @@
 
         b.setCurrentProgram(c.currentProgram);
         b.setChannelCount(c.channelCount);
-        b.setStepSize(c.stepSize);
-        b.setBlockSize(c.blockSize);
+
+        auto framing = b.initFraming();
+        framing.setStepSize(c.framing.stepSize);
+        framing.setBlockSize(c.framing.blockSize);
     }
 
     static void
@@ -492,8 +494,8 @@
 
         c.currentProgram = r.getCurrentProgram();
         c.channelCount = r.getChannelCount();
-        c.stepSize = r.getStepSize();
-        c.blockSize = r.getBlockSize();
+        c.framing.stepSize = r.getFraming().getStepSize();
+        c.framing.blockSize = r.getFraming().getBlockSize();
     }
     
     static void
@@ -642,6 +644,9 @@
             auto od = olist[i];
             buildOutputDescriptor(od, cr.outputs[i]);
         }
+        auto framing = b.initFraming();
+        framing.setStepSize(cr.framing.stepSize);
+        framing.setBlockSize(cr.framing.blockSize);
     }
 
     static void
@@ -657,6 +662,8 @@
             readOutputDescriptor(desc, o);
             cr.outputs.push_back(desc);
         }
+        cr.framing.stepSize = r.getFraming().getStepSize();
+        cr.framing.blockSize = r.getFraming().getBlockSize();
     }
 
     static void