comparison src/vamp-hostsdk/PluginBufferingAdapter.cpp @ 267:93c81a6c917a

* Ensure PluginBufferingAdapter returns fresh output descriptors after
  a call to initialise, setParameter or selectProgram
* Fix RDF document base prefix

     bool initialise(size_t channels, size_t stepSize, size_t blockSize);
 
     void getActualStepAndBlockSizes(size_t &stepSize, size_t &blockSize);
 
     OutputList getOutputDescriptors() const;
+
+    void setParameter(std::string, float);
+    void selectProgram(std::string);
 
     void reset();
 
     FeatureSet process(const float *const *inputBuffers, RealTime timestamp);
 		

 {
     return m_impl->getOutputDescriptors();
 }
 
 void
+PluginBufferingAdapter::setParameter(std::string name, float value)
+{
+    m_impl->setParameter(name, value);
+}
+
+void
+PluginBufferingAdapter::selectProgram(std::string name)
+{
+    m_impl->selectProgram(name);
+}
+
+void
 PluginBufferingAdapter::reset()
 {
     m_impl->reset();
 }
 		

     for (size_t i = 0; i < m_channels; ++i) {
         m_queue.push_back(new RingBuffer(m_blockSize + m_inputBlockSize));
         m_buffers[i] = new float[m_blockSize];
     }
     
-    return m_plugin->initialise(m_channels, m_stepSize, m_blockSize);
+    bool success = m_plugin->initialise(m_channels, m_stepSize, m_blockSize);
+
+    if (success) {
+        // Re-query outputs; properties such as bin count may have
+        // changed on initialise
+        m_outputs.clear();
+        (void)getOutputDescriptors();
+    }
+
+    return success;
 }
 		
 PluginBufferingAdapter::OutputList
 PluginBufferingAdapter::Impl::getOutputDescriptors() const
 {

 
     return outs;
 }
 
 void
+PluginBufferingAdapter::Impl::setParameter(std::string name, float value)
+{
+    m_plugin->setParameter(name, value);
+
+    // Re-query outputs; properties such as bin count may have changed
+    m_outputs.clear();
+    (void)getOutputDescriptors();
+}
+
+void
+PluginBufferingAdapter::Impl::selectProgram(std::string name)
+{
+    m_plugin->selectProgram(name);
+
+    // Re-query outputs; properties such as bin count may have changed
+    m_outputs.clear();
+    (void)getOutputDescriptors();
+}
+
+void
 PluginBufferingAdapter::Impl::reset()
 {
     m_frame = 0;
     m_unrun = true;