comparison plugin/FeatureExtractionPluginFactory.cpp @ 71:e32c6a6cb40f

* Remove dsp directory.  This is now the qm-dsp library used by
  qm-vamp-plugins instead of being used in Sonic Visualiser directly.
* Remove plugins that have now become part of qm-vamp-plugins.
* Move time stretcher from dsp to audioio (this is the one DSP thing
  we do need in SV)

 */
 
 #include "FeatureExtractionPluginFactory.h"
 #include "PluginIdentifier.h"
 
-#include "plugins/BeatDetect.h" //!!!
-#include "plugins/ChromagramPlugin.h" //!!!
-#include "plugins/ZeroCrossing.h" //!!!
-#include "plugins/SpectralCentroid.h" //!!!
-#include "plugins/TonalChangeDetect.h" //!!!
-
 #include "vamp/vamp.h"
 #include "vamp-sdk/PluginHostAdapter.h"
 
 #include "base/System.h"
 

 static FeatureExtractionPluginFactory *_nativeInstance = 0;
 
 FeatureExtractionPluginFactory *
 FeatureExtractionPluginFactory::instance(QString pluginType)
 {
-    if (pluginType == "vamp" || pluginType == "sv") { //!!!
+    if (pluginType == "vamp") {
 	if (!_nativeInstance) {
 	    std::cerr << "FeatureExtractionPluginFactory::instance(" << pluginType.toStdString()
 		      << "): creating new FeatureExtractionPluginFactory" << std::endl;
 	    _nativeInstance = new FeatureExtractionPluginFactory();
 	}

 
 std::vector<QString>
 FeatureExtractionPluginFactory::getPluginIdentifiers()
 {
     std::vector<QString> rv;
-    rv.push_back("sv:_builtin:beats"); //!!!
-    rv.push_back("sv:_builtin:chromagram"); //!!!
-    rv.push_back("sv:_builtin:zerocrossing"); //!!!
-    rv.push_back("sv:_builtin:spectralcentroid"); //!!!
-    rv.push_back("sv:_builtin:tonalchange"); //!!!
-
     std::vector<QString> path = getPluginPath();
     
     for (std::vector<QString>::iterator i = path.begin(); i != path.end(); ++i) {
 
         std::cerr << "FeatureExtractionPluginFactory::getPluginIdentifiers: scanning directory " << i->toStdString() << std::endl;

             QString soname = pluginDir.filePath(pluginDir[j]);
 
             void *libraryHandle = DLOPEN(soname, RTLD_LAZY);
             
             if (!libraryHandle) {
-                std::cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: Failed to load library " << soname.toStdString() << std::endl;
+                std::cerr << "WARNING: FeatureExtractionPluginFactory::getPluginIdentifiers: Failed to load library " << soname.toStdString() << ": " << DLERROR() << std::endl;
                 continue;
             }
 
             VampGetPluginDescriptorFunction fn = (VampGetPluginDescriptorFunction)
                 DLSYM(libraryHandle, "vampGetPluginDescriptor");

     const VampPluginDescriptor *descriptor = 0;
     int index = 0;
 
     QString type, soname, label;
     PluginIdentifier::parseIdentifier(identifier, type, soname, label);
-    if (type != "vamp" && type != "sv") { //!!!
+    if (type != "vamp") {
 	std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Wrong factory for plugin type " << type.toStdString() << std::endl;
 	return 0;
-    }
-
-    //!!!
-    if (type == "sv" && soname == PluginIdentifier::BUILTIN_PLUGIN_SONAME) {
-
-        if (label == "beats") {
-            return new BeatDetector(inputSampleRate); //!!!
-        }
-        
-        if (label == "chromagram") {
-            return new ChromagramPlugin(inputSampleRate); //!!!
-        }
-        
-        if (label == "zerocrossing") {
-            return new ZeroCrossing(inputSampleRate); //!!!
-        }
-        
-        if (label == "spectralcentroid") {
-            return new SpectralCentroid(inputSampleRate); //!!!
-        }
-        
-        if (label == "tonalchange") {
-            return new TonalChangeDetect(inputSampleRate); //!!!
-        }
-        
-        std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Unknown plugin \"" << identifier.toStdString() << "\"" << std::endl;
-        
-        return 0;
     }
 
     QString found = findPluginFile(soname);
 
     if (found == "") {

     soname = found;
 
     void *libraryHandle = DLOPEN(soname, RTLD_LAZY);
             
     if (!libraryHandle) {
-        std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Failed to load library " << soname.toStdString() << std::endl;
+        std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Failed to load library " << soname.toStdString() << ": " << DLERROR() << std::endl;
         return 0;
     }
 
     VampGetPluginDescriptorFunction fn = (VampGetPluginDescriptorFunction)
         DLSYM(libraryHandle, "vampGetPluginDescriptor");