comparison vamp-support/PluginConfiguration.h @ 185:3eb00e5c76c4

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

Update the C++ code to separate out the framing parameters (step and
block size) from the configuration structure into their own structure,
as in the latest schema, and to return the accepted framing params in
the configuration response.

This also implies that the plugin stub (which adapts Piper API
back to Vamp) makes a note of the returned values,
making them available via its own getPreferredStep/BlockSize
so that the host can retry the initialise call in the case where it
failed for having the wrong values first time.

 #include <string>
 
 namespace piper_vamp {
 
 /**
+ * \struct Framing
+ * 
+ * A structure bundling the processing step and block size.
+ */
+struct Framing
+{
+    Framing() : // invalid by default 
+        stepSize(0), blockSize(0) { }
+    
+    int stepSize;
+    int blockSize;
+};
+
+/**
  * \class PluginConfiguration
  * 
  * PluginConfiguration is a structure bundling together data that
  * affect the configuration of a plugin: parameter values, programs,
  * and initialisation settings. Although an interactive Vamp plugin

  * configuration settings together.
  */
 struct PluginConfiguration
 {
     PluginConfiguration() : // invalid configuration by default
-	channelCount(0), stepSize(0), blockSize(0) { }
+	channelCount(0) { }
 	
     int channelCount;
-    int stepSize;
-    int blockSize;
+    Framing framing;
     typedef std::map<std::string, float> ParameterMap;
     ParameterMap parameterValues;
     std::string currentProgram;
 
     static PluginConfiguration

 	       int blockSize) {
 	
 	PluginConfiguration c;
 	
 	c.channelCount = channelCount;
-	c.stepSize = stepSize;
-	c.blockSize = blockSize;
+	c.framing.stepSize = stepSize;
+	c.framing.blockSize = blockSize;
 
 	Vamp::PluginBase::ParameterList params = p->getParameterDescriptors();
 	for (Vamp::PluginBase::ParameterList::const_iterator i = params.begin();
 	     i != params.end(); ++i) {
 	    std::string pid = i->identifier;