Merge branch 'master' into audioengine

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

diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index 9c086749cf6a67674ea9dcd6445fd08262bf270f..94e8d4ff2f0eb38b1ee051083dd90c8cc3ffe12c 100644 (file)
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -20,12 +20,13 @@
 #include <unistd.h>
 
 #include <glibmm/pattern.h>
+#include <glibmm/fileutils.h>
 
 #include "pbd/error.h"
 #include "pbd/compose.h"
 #include "pbd/file_utils.h"
-#include "pbd/symlink.h"
 
+#include "ardour/debug.h"
 #include "ardour/panner_manager.h"
 #include "ardour/panner_search_path.h"
 
@@ -61,7 +62,7 @@ PannerManager::instance ()
 void
 PannerManager::discover_panners ()
 {
-       vector<sys::path> panner_modules;
+       vector<std::string> panner_modules;
 
        Glib::PatternSpec so_extension_pattern("*.so");
        Glib::PatternSpec dylib_extension_pattern("*.dylib");
@@ -72,28 +73,32 @@ PannerManager::discover_panners ()
        find_matching_files_in_search_path (panner_search_path (),
                                            dylib_extension_pattern, panner_modules);
 
-       info << string_compose (_("looking for panners in %1"), panner_search_path().to_string()) << endmsg;
+       DEBUG_TRACE (DEBUG::Panning, string_compose (_("looking for panners in %1"), panner_search_path().to_string()));
 
-       for (vector<sys::path>::iterator i = panner_modules.begin(); i != panner_modules.end(); ++i) {
-               panner_discover ((*i).to_string());
+       for (vector<std::string>::iterator i = panner_modules.begin(); i != panner_modules.end(); ++i) {
+               panner_discover (*i);
        }
 }
+
 int
 PannerManager::panner_discover (string path)
 {
        PannerInfo* pinfo;
 
-       /* don't look in symlinks, because otherwise we find too many versions
-        * of the same library.
-        */
+       if ((pinfo = get_descriptor (path)) != 0) {
 
-       if (PBD::is_symlink (path)) {
-               return 0;
-       }
+               list<PannerInfo*>::iterator i;
 
-       if ((pinfo = get_descriptor (path)) != 0) {
-               panner_info.push_back (pinfo);
-               info << string_compose(_("Panner discovered: \"%1\" in %2"), pinfo->descriptor.name, path) << endmsg;
+               for (i = panner_info.begin(); i != panner_info.end(); ++i) {
+                       if (pinfo->descriptor.name == (*i)->descriptor.name) {
+                               break;
+                       }
+               }
+
+               if (i == panner_info.end()) {
+                       panner_info.push_back (pinfo);
+                       DEBUG_TRACE (DEBUG::Panning, string_compose(_("Panner discovered: \"%1\" in %2"), pinfo->descriptor.name, path));
+               }
        }
 
        return 0;