comparison 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

             param.setValue(pp.second);
         }
 
         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
     readConfiguration(PluginConfiguration &c,
                       const piper::Configuration::Reader &r) {

             c.parameterValues[p.getParameter()] = p.getValue();
         }
 
         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
     buildListRequest(piper::ListRequest::Builder &r,
                      const ListRequest &resp) {

         auto olist = b.initOutputs(unsigned(cr.outputs.size()));
         for (int i = 0; i < int(cr.outputs.size()); ++i) {
             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
     readConfigurationResponse(ConfigurationResponse &cr,
                               const piper::ConfigurationResponse::Reader &r,

         for (const auto &o: oo) {
             Vamp::Plugin::OutputDescriptor desc;
             readOutputDescriptor(desc, o);
             cr.outputs.push_back(desc);
         }
+        cr.framing.stepSize = r.getFraming().getStepSize();
+        cr.framing.blockSize = r.getFraming().getBlockSize();
     }
 
     static void
     buildProcessInput(piper::ProcessInput::Builder &b,
                       Vamp::RealTime timestamp,