diff plugin/FeatureExtractionPluginFactory.cpp @ 117:c30728d5625c sv1-v0.9rc1

* Make vertical scale alignment modes work in note layer as well as time-value layer, and several significant fixes to it * Make it possible to draw notes properly on the note layer * Show units (and frequencies etc in note layer's case) in the time-value and note layer description boxes * Minor fix to item edit dialog layout * Some minor menu rearrangement * Comment out a lot of debug output * Add SV website and reference URLs to Help menu, and add code to (attempt to) open them in the user's preferred browser
author Chris Cannam
date Fri, 12 May 2006 14:40:43 +0000
parents b2067aff8cd6
children 4b2ea82fd0ed
line wrap: on
line diff
--- a/plugin/FeatureExtractionPluginFactory.cpp	Thu May 11 15:02:14 2006 +0000
+++ b/plugin/FeatureExtractionPluginFactory.cpp	Fri May 12 14:40:43 2006 +0000
@@ -55,6 +55,8 @@
 std::vector<QString>
 FeatureExtractionPluginFactory::getPluginPath()
 {
+    if (!m_pluginPath.empty()) return m_pluginPath;
+
     std::vector<QString> path;
     std::string envPath;
 
@@ -93,6 +95,7 @@
     
     path.push_back(envPath.substr(index).c_str());
 
+    m_pluginPath = path;
     return path;
 }
 
@@ -123,7 +126,7 @@
     
     for (std::vector<QString>::iterator i = path.begin(); i != path.end(); ++i) {
 
-        std::cerr << "FeatureExtractionPluginFactory::getPluginIdentifiers: scanning directory " << i->toStdString() << std::endl;
+//        std::cerr << "FeatureExtractionPluginFactory::getPluginIdentifiers: scanning directory " << i->toStdString() << std::endl;
 
 	QDir pluginDir(*i, PLUGIN_GLOB,
                        QDir::Name | QDir::IgnoreCase,
@@ -240,8 +243,10 @@
 
     if (found == "") {
         std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Failed to find library file " << soname.toStdString() << std::endl;
+        return 0;
     } else if (found != soname) {
-        std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: WARNING: Given library name was " << soname.toStdString() << ", found at " << found.toStdString() << std::endl;
+//        std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: WARNING: Given library name was " << soname.toStdString() << ", found at " << found.toStdString() << std::endl;
+//        std::cerr << soname.toStdString() << " -> " << found.toStdString() << std::endl;
     }
 
     soname = found;
@@ -273,7 +278,7 @@
 
     rv = new Vamp::PluginHostAdapter(descriptor, inputSampleRate);
 
-    std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Constructed Vamp plugin, rv is " << rv << std::endl;
+//    std::cerr << "FeatureExtractionPluginFactory::instantiatePlugin: Constructed Vamp plugin, rv is " << rv << std::endl;
 
     //!!! need to dlclose() when plugins from a given library are unloaded