convert from Glib:: to Glib::Threads for all thread-related API

[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 c72d3f31d04beab581e924d35546268c193c0b89..8611447a93592a33397fdda846e1ced9e5397ff2 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"
 
@@ -41,12 +42,11 @@ const string ControlProtocolManager::state_node_name = X_("ControlProtocols");
 
 ControlProtocolManager::ControlProtocolManager ()
 {
-
 }
 
 ControlProtocolManager::~ControlProtocolManager()
 {
-       Glib::Mutex::Lock lm (protocols_lock);
+       Glib::Threads::Mutex::Lock lm (protocols_lock);
 
        for (list<ControlProtocol*>::iterator i = control_protocols.begin(); i != control_protocols.end(); ++i) {
                delete (*i);
@@ -68,7 +68,7 @@ ControlProtocolManager::set_session (Session* s)
        SessionHandlePtr::set_session (s);
 
        if (_session) {
-               Glib::Mutex::Lock lm (protocols_lock);
+               Glib::Threads::Mutex::Lock lm (protocols_lock);
 
                for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
                        if ((*i)->requested || (*i)->mandatory) {
@@ -97,7 +97,7 @@ ControlProtocolManager::session_going_away()
        SessionHandlePtr::session_going_away ();
 
        {
-               Glib::Mutex::Lock lm (protocols_lock);
+               Glib::Threads::Mutex::Lock lm (protocols_lock);
 
                for (list<ControlProtocol*>::iterator p = control_protocols.begin(); p != control_protocols.end(); ++p) {
                        delete *p;
@@ -160,7 +160,7 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi)
        cpi.descriptor->destroy (cpi.descriptor, cpi.protocol);
 
        {
-               Glib::Mutex::Lock lm (protocols_lock);
+               Glib::Threads::Mutex::Lock lm (protocols_lock);
                list<ControlProtocol*>::iterator p = find (control_protocols.begin(), control_protocols.end(), cpi.protocol);
                if (p != control_protocols.end()) {
                        control_protocols.erase (p);
@@ -170,6 +170,8 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi)
        }
 
        cpi.protocol = 0;
+       delete cpi.state;
+       cpi.state = 0;
        dlclose (cpi.descriptor->module);
        return 0;
 }
@@ -181,7 +183,7 @@ ControlProtocolManager::load_mandatory_protocols ()
                return;
        }
 
-       Glib::Mutex::Lock lm (protocols_lock);
+       Glib::Threads::Mutex::Lock lm (protocols_lock);
 
        for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
                if ((*i)->mandatory && ((*i)->protocol == 0)) {
@@ -195,22 +197,22 @@ ControlProtocolManager::load_mandatory_protocols ()
 void
 ControlProtocolManager::discover_control_protocols ()
 {
-       vector<sys::path> cp_modules;
+       vector<std::string> cp_modules;
 
        Glib::PatternSpec so_extension_pattern("*.so");
        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());
+       for (vector<std::string>::iterator i = cp_modules.begin(); i != cp_modules.end(); ++i) {
+               control_protocol_discover (*i);
        }
 }
 
@@ -219,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)) {
@@ -308,7 +319,7 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/)
        XMLNodeConstIterator citer;
        XMLProperty* prop;
 
-       Glib::Mutex::Lock lm (protocols_lock);
+       Glib::Threads::Mutex::Lock lm (protocols_lock);
 
        clist = node.children();
 
@@ -320,13 +331,15 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/)
                        if (prop && string_is_affirmative (prop->value())) {
                                if ((prop = (*citer)->property (X_("name"))) != 0) {
                                        ControlProtocolInfo* cpi = cpi_by_name (prop->value());
+
                                        if (cpi) {
-                                               if (!(*citer)->children().empty()) {
-                                                       cpi->state = (*citer)->children().front ();
-                                               } else {
-                                                       cpi->state = 0;
+
+                                               if (cpi->state) {
+                                                       delete cpi->state;
                                                }
 
+                                               cpi->state = new XMLNode (**citer);
+
                                                if (_session) {
                                                        instantiate (*cpi);
                                                } else {
@@ -344,7 +357,7 @@ XMLNode&
 ControlProtocolManager::get_state ()
 {
        XMLNode* root = new XMLNode (state_node_name);
-       Glib::Mutex::Lock lm (protocols_lock);
+       Glib::Threads::Mutex::Lock lm (protocols_lock);
 
        for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
 
@@ -413,7 +426,7 @@ ControlProtocolManager::instance ()
 void
 ControlProtocolManager::midi_connectivity_established ()
 {
-       Glib::Mutex::Lock lm (protocols_lock);
+       Glib::Threads::Mutex::Lock lm (protocols_lock);
 
        for (list<ControlProtocol*>::iterator p = control_protocols.begin(); p != control_protocols.end(); ++p) {
                (*p)->midi_connectivity_established ();