comparison transform/TransformFactory.cpp @ 66:7afcfe666910

* 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 "FeatureExtractionPluginTransform.h"
 #include "RealTimePluginTransform.h"
 
 #include "plugin/FeatureExtractionPluginFactory.h"
 #include "plugin/RealTimePluginFactory.h"
+#include "plugin/PluginXml.h"
 
 #include "widgets/PluginParameterDialog.h"
 
 #include "model/DenseTimeValueModel.h"
 

 	if (!factory) {
 	    std::cerr << "WARNING: TransformFactory::populateTransforms: No feature extraction plugin factory for instance " << pluginId.toLocal8Bit().data() << std::endl;
 	    continue;
 	}
 
-	FeatureExtractionPlugin *plugin = 
+	Vamp::Plugin *plugin = 
 	    factory->instantiatePlugin(pluginId, 48000);
 
 	if (!plugin) {
 	    std::cerr << "WARNING: TransformFactory::populateTransforms: Failed to instantiate plugin " << pluginId.toLocal8Bit().data() << std::endl;
 	    continue;
 	}
 		
 	QString pluginDescription = plugin->getDescription().c_str();
-	FeatureExtractionPlugin::OutputList outputs =
+	Vamp::Plugin::OutputList outputs =
 	    plugin->getOutputDescriptors();
 
 	for (size_t j = 0; j < outputs.size(); ++j) {
 
 	    QString transformName = QString("%1:%2")

 {
     QString id = name.section(':', 0, 2);
 
     if (FeatureExtractionPluginFactory::instanceFor(id)) {
 
-        FeatureExtractionPlugin *plugin = 
+        Vamp::Plugin *plugin = 
             FeatureExtractionPluginFactory::instanceFor(id)->
             instantiatePlugin(id, 48000);
         if (!plugin) return false;
 
         min = plugin->getMinChannelCount();

     bool ok = false;
     configurationXml = m_lastConfigurations[name];
 
     std::cerr << "last configuration: " << configurationXml.toStdString() << std::endl;
 
-    PluginInstance *plugin = 0;
+    Vamp::PluginBase *plugin = 0;
 
     if (FeatureExtractionPluginFactory::instanceFor(id)) {
 
         plugin = FeatureExtractionPluginFactory::instanceFor(id)->instantiatePlugin
             (id, inputModel->getSampleRate());

             (id, 0, 0, inputModel->getSampleRate(), 1024, 1);
     }
 
     if (plugin) {
         if (configurationXml != "") {
-            plugin->setParametersFromXml(configurationXml);
+            PluginXml(plugin).setParametersFromXml(configurationXml);
         }
 
         int sourceChannels = 1;
         if (dynamic_cast<DenseTimeValueModel *>(inputModel)) {
             sourceChannels = dynamic_cast<DenseTimeValueModel *>(inputModel)

                                                                   targetChannels,
                                                                   defaultChannel);
         if (dialog->exec() == QDialog::Accepted) {
             ok = true;
         }
-        configurationXml = plugin->toXmlString();
+        configurationXml = PluginXml(plugin).toXmlString();
         channel = dialog->getChannel();
         delete dialog;
         delete plugin;
     }