Remove debug code.

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

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index cce9fe08a14f96b49aa2e8be5f110800c1709544..475781f3c57296287e050f9193d919f645c25f4c 100644 (file)
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -19,6 +19,8 @@
 
 #include <dlfcn.h>
 
+#include <glibmm/fileutils.h>
+
 #include "pbd/compose.h"
 #include "pbd/file_utils.h"
 #include "pbd/error.h"
@@ -26,7 +28,6 @@
 #include "control_protocol/control_protocol.h"
 
 #include "ardour/debug.h"
-#include "ardour/session.h"
 #include "ardour/control_protocol_manager.h"
 #include "ardour/control_protocol_search_path.h"
 
@@ -202,13 +203,13 @@ ControlProtocolManager::discover_control_protocols ()
        Glib::PatternSpec dylib_extension_pattern("*.dylib");
 
        find_matching_files_in_search_path (control_protocol_search_path (),
-                       so_extension_pattern, cp_modules);
+                                           so_extension_pattern, cp_modules);
 
        find_matching_files_in_search_path (control_protocol_search_path (),
-                       dylib_extension_pattern, cp_modules);
+                                           dylib_extension_pattern, cp_modules);
 
        DEBUG_TRACE (DEBUG::ControlProtocols, 
-                    string_compose (_("looking for control protocols in %1"), control_protocol_search_path().to_string()));
+                    string_compose (_("looking for control protocols in %1\n"), control_protocol_search_path().to_string()));
        
        for (vector<sys::path>::iterator i = cp_modules.begin(); i != cp_modules.end(); ++i) {
                control_protocol_discover ((*i).to_string());
@@ -220,6 +221,15 @@ ControlProtocolManager::control_protocol_discover (string path)
 {
        ControlProtocolDescriptor* descriptor;
 
+#ifdef __APPLE__
+       /* don't load OS X shared objects that are just symlinks to the real thing.
+        */
+
+       if (path.find (".dylib") && Glib::file_test (path, Glib::FILE_TEST_IS_SYMLINK)) {
+               return 0;
+       }
+#endif
+
        if ((descriptor = get_descriptor (path)) != 0) {
 
                if (!descriptor->probe (descriptor)) {