comparison widgets/PluginParameterBox.cpp @ 71:72fa239a4880

* Modify to use Vamp SDK for proper feature extraction plugins.
  Requires that the vamp-plugin-sdk directory tree be present below
  plugin/ (it's separate in Subversion).

 
 #include "PluginParameterBox.h"
 
 #include "AudioDial.h"
 
+#include "plugin/PluginXml.h"
+
 #include <QDoubleSpinBox>
 #include <QGridLayout>
 #include <QComboBox>
 #include <QCheckBox>
 #include <QLayout>
 #include <QLabel>
 
 #include <iostream>
 #include <string>
 
-PluginParameterBox::PluginParameterBox(PluginInstance *plugin, QWidget *parent) :
+PluginParameterBox::PluginParameterBox(Vamp::PluginBase *plugin, QWidget *parent) :
     QFrame(parent),
     m_plugin(plugin)
 {
     m_layout = new QGridLayout;
     setLayout(m_layout);

 }
 
 void
 PluginParameterBox::populate()
 {
-    PluginInstance::ParameterList params = m_plugin->getParameterDescriptors();
-    PluginInstance::ProgramList programs = m_plugin->getPrograms();
+    Vamp::PluginBase::ParameterList params = m_plugin->getParameterDescriptors();
+    Vamp::PluginBase::ProgramList programs = m_plugin->getPrograms();
 
     m_params.clear();
 
     if (params.empty() && programs.empty()) {
         m_layout->addWidget

     if (m_params.find(name) == m_params.end()) {
         std::cerr << "WARNING: PluginParameterBox::dialChanged: Unknown parameter \"" << name.toStdString() << "\"" << std::endl;
         return;
     }
 
-    PluginInstance::ParameterDescriptor params = m_params[name].param;
+    Vamp::PluginBase::ParameterDescriptor params = m_params[name].param;
 
     float min = params.minValue;
     float max = params.maxValue;
 
     float qtz = 0.0;

         spin->blockSignals(false);
     }
 
     m_plugin->setParameter(name.toStdString(), newValue);
 
-    emit pluginConfigurationChanged(m_plugin->toXmlString());
+    emit pluginConfigurationChanged(PluginXml(m_plugin).toXmlString());
 }
 
 void
 PluginParameterBox::checkBoxChanged(int state)
 {

     if (m_params.find(name) == m_params.end()) {
         std::cerr << "WARNING: PluginParameterBox::checkBoxChanged: Unknown parameter \"" << name.toStdString() << "\"" << std::endl;
         return;
     }
 
-    PluginInstance::ParameterDescriptor params = m_params[name].param;
+    Vamp::PluginBase::ParameterDescriptor params = m_params[name].param;
 
     if (state) m_plugin->setParameter(name.toStdString(), 1.0);
     else m_plugin->setParameter(name.toStdString(), 0.0);
 
-    emit pluginConfigurationChanged(m_plugin->toXmlString());
+    emit pluginConfigurationChanged(PluginXml(m_plugin).toXmlString());
 }
 
 void
 PluginParameterBox::spinBoxChanged(double value)
 {

     if (m_params.find(name) == m_params.end()) {
         std::cerr << "WARNING: PluginParameterBox::spinBoxChanged: Unknown parameter \"" << name.toStdString() << "\"" << std::endl;
         return;
     }
 
-    PluginInstance::ParameterDescriptor params = m_params[name].param;
+    Vamp::PluginBase::ParameterDescriptor params = m_params[name].param;
 
     float min = params.minValue;
     float max = params.maxValue;
 
     float qtz = 0.0;

         dial->blockSignals(false);
     }
 
     m_plugin->setParameter(name.toStdString(), value);
 
-    emit pluginConfigurationChanged(m_plugin->toXmlString());
+    emit pluginConfigurationChanged(PluginXml(m_plugin).toXmlString());
 }
 
 void
 PluginParameterBox::programComboChanged(const QString &newProgram)
 {
     m_plugin->selectProgram(newProgram.toStdString());
 
     for (std::map<QString, ParamRec>::iterator i = m_params.begin();
          i != m_params.end(); ++i) {
 
-        PluginInstance::ParameterDescriptor &param = i->second.param;
+        Vamp::PluginBase::ParameterDescriptor &param = i->second.param;
         float value = m_plugin->getParameter(param.name);
 
         if (i->second.spin) {
             i->second.spin->blockSignals(true);
             i->second.spin->setValue(value);

             i->second.dial->setValue(int((value - min) / qtz));
             i->second.dial->blockSignals(false);
         }
     }
 
-    emit pluginConfigurationChanged(m_plugin->toXmlString());
-}
-
+    emit pluginConfigurationChanged(PluginXml(m_plugin).toXmlString());
+}
+