incomplete merge of master into windows (requires upcoming changes to master to be...

[ardour.git] / libs / ardour / panner_manager.cc

diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index 94e8d4ff2f0eb38b1ee051083dd90c8cc3ffe12c..8611c7bc86d5b4ba9c183a25014126b45e1e8f58 100644 (file)
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -28,6 +28,7 @@
 
 #include "ardour/debug.h"
 #include "ardour/panner_manager.h"
+
 #include "ardour/panner_search_path.h"
 
 #include "i18n.h"
@@ -66,6 +67,7 @@ PannerManager::discover_panners ()
 
        Glib::PatternSpec so_extension_pattern("*.so");
        Glib::PatternSpec dylib_extension_pattern("*.dylib");
+       Glib::PatternSpec dll_extension_pattern("*.dll");
 
        find_matching_files_in_search_path (panner_search_path (),
                                            so_extension_pattern, panner_modules);
@@ -73,6 +75,9 @@ PannerManager::discover_panners ()
        find_matching_files_in_search_path (panner_search_path (),
                                            dylib_extension_pattern, panner_modules);
 
+       find_matching_files_in_search_path (panner_search_path (),
+                                           dll_extension_pattern, panner_modules);
+
        DEBUG_TRACE (DEBUG::Panning, string_compose (_("looking for panners in %1"), panner_search_path().to_string()));
 
        for (vector<std::string>::iterator i = panner_modules.begin(); i != panner_modules.end(); ++i) {
@@ -107,31 +112,33 @@ PannerManager::panner_discover (string path)
 PannerInfo*
 PannerManager::get_descriptor (string path)
 {
-       void *module;
+       Glib::Module* module = new Glib::Module(path);
        PannerInfo* info = 0;
        PanPluginDescriptor *descriptor = 0;
        PanPluginDescriptor* (*dfunc)(void);
-       const char *errstr;
+       void* func = 0;
 
-       if ((module = dlopen (path.c_str(), RTLD_NOW)) == 0) {
-               error << string_compose(_("PannerManager: cannot load module \"%1\" (%2)"), path, dlerror()) << endmsg;
+       if (!module) {
+               error << string_compose(_("PannerManager: cannot load module \"%1\" (%2)"), path,
+                               Glib::Module::get_last_error()) << endmsg;
+               delete module;
                return 0;
        }
 
-       dfunc = (PanPluginDescriptor* (*)(void)) dlsym (module, "panner_descriptor");
-
-       if ((errstr = dlerror()) != 0) {
+       if (!module->get_symbol("panner_descriptor", func)) {
                error << string_compose(_("PannerManager: module \"%1\" has no descriptor function."), path) << endmsg;
-               error << errstr << endmsg;
-               dlclose (module);
+               error << Glib::Module::get_last_error() << endmsg;
+               delete module;
                return 0;
        }
 
+       dfunc = (PanPluginDescriptor* (*)(void))func;
        descriptor = dfunc();
+
        if (descriptor) {
                info = new PannerInfo (*descriptor, module);
        } else {
-               dlclose (module);
+               delete module;
        }
 
        return info;