comparison plugin/LADSPAPluginFactory.cpp @ 166:702fc936e6a6

* Pull transforms out of Layer menu (again) and into a separate Transforms
  menu
* Add Recent Transforms submenu
* Add effects and generators to the transforms menu (not yet implemented)
  as well as analysis plugins and data-from-effects (control output ports)
* Add a nice dictionary-volume-style alphabetic subdivision of plugin names
  in plugins By Name menus

 #endif // HAVE_LRDF
 
 
 LADSPAPluginFactory::LADSPAPluginFactory()
 {
+#ifdef HAVE_LRDF
+    lrdf_init();
+#endif
 }
  
 LADSPAPluginFactory::~LADSPAPluginFactory()
 {
     for (std::set<RealTimePluginInstance *>::iterator i = m_instances.begin();

 	(*i)->setFactory(0);
 	delete *i;
     }
     m_instances.clear();
     unloadUnusedLibraries();
+
+#ifdef HAVE_LRDF
+    lrdf_cleanup();
+#endif // HAVE_LRDF
 }
 
 const std::vector<QString> &
 LADSPAPluginFactory::getPluginIdentifiers() const
 {

                  QDir::Files | QDir::Readable);
 
         if (QFileInfo(dir.filePath(fileName)).exists()) {
             std::cerr << "Loading: " << fileName.toStdString() << std::endl;
             libraryHandle = DLOPEN(dir.filePath(fileName), RTLD_NOW);
-            if (libraryHandle) m_libraryHandles[soName] = libraryHandle;
-            return;
+            if (libraryHandle) {
+                m_libraryHandles[soName] = libraryHandle;
+                return;
+            }
         }
 
 	for (unsigned int j = 0; j < dir.count(); ++j) {
             QString file = dir.filePath(dir[j]);
             if (QFileInfo(file).baseName() == base) {
                 std::cerr << "Loading: " << file.toStdString() << std::endl;
                 libraryHandle = DLOPEN(file, RTLD_NOW);
-                if (libraryHandle) m_libraryHandles[soName] = libraryHandle;
-                return;
+                if (libraryHandle) {
+                    m_libraryHandles[soName] = libraryHandle;
+                    return;
+                }
             }
         }
     }
 
     std::cerr << "LADSPAPluginFactory::loadLibrary: Failed to locate plugin library \"" << soName.toStdString() << "\"" << std::endl;

 	std::cerr << "[" << i->toStdString() << "] ";
     }
     std::cerr << std::endl;
 
 #ifdef HAVE_LRDF
-    // Initialise liblrdf and read the description files 
+    // read the description files 
     //
-    lrdf_init();
-
     QString baseUri;
     std::vector<QString> lrdfPaths = getLRDFPath(baseUri);
 
     bool haveSomething = false;
 

 
 	for (unsigned int j = 0; j < pluginDir.count(); ++j) {
 	    discoverPlugins(QString("%1/%2").arg(*i).arg(pluginDir[j]));
 	}
     }
-
-#ifdef HAVE_LRDF
-    // Cleanup after the RDF library
-    //
-    lrdf_cleanup();
-#endif // HAVE_LRDF
 }
 
 void
 LADSPAPluginFactory::discoverPlugins(QString soname)
 {

         rtd->copyright = descriptor->Copyright;
         rtd->category = "";
         rtd->isSynth = false;
         rtd->parameterCount = 0;
         rtd->audioInputPortCount = 0;
+        rtd->audioOutputPortCount = 0;
         rtd->controlOutputPortCount = 0;
 
 	QString identifier = PluginIdentifier::createIdentifier
 	    ("ladspa", soname, descriptor->Label);
 

                     }
                 }
             } else {
                 if (LADSPA_IS_PORT_INPUT(descriptor->PortDescriptors[i])) {
                     ++rtd->audioInputPortCount;
+                } else if (LADSPA_IS_PORT_OUTPUT(descriptor->PortDescriptors[i])) {
+                    ++rtd->audioOutputPortCount;
                 }
             }
         }
 
 	m_identifiers.push_back(identifier);