X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcontrol_protocol_manager.cc;h=2b0a4dce4cd71e5fb8ddb822cdbbbb9d718e35d6;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=49b3d0776161c6ecfe2b99473c194ad151905bd5;hpb=0daae2ec91f8c8324e8db4e9583d1ce1eca6524a;p=ardour.git diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 49b3d07761..2b0a4dce4c 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -22,6 +22,7 @@ #include #include "pbd/compose.h" +#include "pbd/event_loop.h" #include "pbd/file_utils.h" #include "pbd/error.h" @@ -37,7 +38,7 @@ using namespace ARDOUR; using namespace std; using namespace PBD; -#include "i18n.h" +#include "pbd/i18n.h" ControlProtocolManager* ControlProtocolManager::_instance = 0; const string ControlProtocolManager::state_node_name = X_("ControlProtocols"); @@ -113,7 +114,7 @@ ControlProtocolManager::activate (ControlProtocolInfo& cpi) cp->set_active (true); return 0; -} +} int ControlProtocolManager::deactivate (ControlProtocolInfo& cpi) @@ -126,23 +127,32 @@ void ControlProtocolManager::session_going_away() { SessionHandlePtr::session_going_away (); + /* Session::destroy() will explicitly call drop_protocols() so we don't + * have to worry about that here. + */ +} - { - Glib::Threads::Mutex::Lock lm (protocols_lock); +void +ControlProtocolManager::drop_protocols () +{ + /* called explicitly by Session::destroy() so that we can clean up + * before the process cycle stops and ports vanish. + */ - for (list::iterator p = control_protocols.begin(); p != control_protocols.end(); ++p) { - delete *p; - } + Glib::Threads::Mutex::Lock lm (protocols_lock); - control_protocols.clear (); + for (list::iterator p = control_protocols.begin(); p != control_protocols.end(); ++p) { + delete *p; + } - for (list::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) { - // mark existing protocols as requested - // otherwise the ControlProtocol instances are not recreated in set_session - if ((*p)->protocol) { - (*p)->requested = true; - (*p)->protocol = 0; - } + control_protocols.clear (); + + for (list::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) { + // mark existing protocols as requested + // otherwise the ControlProtocol instances are not recreated in set_session + if ((*p)->protocol) { + (*p)->requested = true; + (*p)->protocol = 0; } } } @@ -158,7 +168,7 @@ ControlProtocolManager::instantiate (ControlProtocolInfo& cpi) cpi.descriptor = get_descriptor (cpi.path); - DEBUG_TRACE (DEBUG::ControlProtocols, string_compose ("instantiating %1\n", cpi.name)); + DEBUG_TRACE (DEBUG::ControlProtocols, string_compose ("instantiating %1\n", cpi.name)); if (cpi.descriptor == 0) { error << string_compose (_("control protocol name \"%1\" has no descriptor"), cpi.name) << endmsg; @@ -183,6 +193,18 @@ int ControlProtocolManager::teardown (ControlProtocolInfo& cpi) { if (!cpi.protocol) { + + /* we could still have a descriptor even if the protocol was + never instantiated. Close the associated module (shared + object/DLL) and make sure we forget about it. + */ + + if (cpi.descriptor) { + cerr << "Closing descriptor for CPI anyway\n"; + delete (Glib::Module*) cpi.descriptor->module; + cpi.descriptor = 0; + } + return 0; } @@ -193,7 +215,7 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi) if (cpi.mandatory) { return 0; } - + /* save current state */ delete cpi.state; @@ -213,9 +235,15 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi) } cpi.protocol = 0; + delete cpi.state; cpi.state = 0; - delete (Glib::Module*)cpi.descriptor->module; + delete (Glib::Module*) cpi.descriptor->module; + /* cpi->descriptor is now inaccessible since dlclose() or equivalent + * has been performed, and the descriptor is (or could be) a static + * object made accessible by dlopen(). + */ + cpi.descriptor = 0; ProtocolStatusChange (&cpi); @@ -268,18 +296,18 @@ ControlProtocolManager::discover_control_protocols () Glib::PatternSpec so_extension_pattern("*.so"); Glib::PatternSpec dylib_extension_pattern("*.dylib"); - find_matching_files_in_search_path (control_protocol_search_path (), - dll_extension_pattern, cp_modules); + find_files_matching_pattern (cp_modules, control_protocol_search_path (), + dll_extension_pattern); - find_matching_files_in_search_path (control_protocol_search_path (), - so_extension_pattern, cp_modules); + find_files_matching_pattern (cp_modules, control_protocol_search_path (), + so_extension_pattern); - find_matching_files_in_search_path (control_protocol_search_path (), - dylib_extension_pattern, cp_modules); + find_files_matching_pattern (cp_modules, control_protocol_search_path (), + dylib_extension_pattern); - DEBUG_TRACE (DEBUG::ControlProtocols, + DEBUG_TRACE (DEBUG::ControlProtocols, string_compose (_("looking for control protocols in %1\n"), control_protocol_search_path().to_string())); - + for (vector::iterator i = cp_modules.begin(); i != cp_modules.end(); ++i) { control_protocol_discover (*i); } @@ -319,11 +347,9 @@ ControlProtocolManager::control_protocol_discover (string path) control_protocol_info.push_back (cpi); - DEBUG_TRACE (DEBUG::ControlProtocols, + DEBUG_TRACE (DEBUG::ControlProtocols, string_compose(_("Control surface protocol discovered: \"%1\"\n"), cpi->name)); } - - delete (Glib::Module*)descriptor->module; } return 0; @@ -355,8 +381,6 @@ ControlProtocolManager::get_descriptor (string path) if (descriptor) { descriptor->module = (void*)module; - } else { - delete module; } return descriptor; @@ -386,30 +410,32 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/) { XMLNodeList clist; XMLNodeConstIterator citer; - XMLProperty* prop; + XMLProperty const * prop; Glib::Threads::Mutex::Lock lm (protocols_lock); clist = node.children(); for (citer = clist.begin(); citer != clist.end(); ++citer) { - if ((*citer)->name() == X_("Protocol")) { + XMLNode const * child = *citer; - if ((prop = (*citer)->property (X_("active"))) == 0) { + if (child->name() == X_("Protocol")) { + + if ((prop = child->property (X_("active"))) == 0) { continue; } bool active = string_is_affirmative (prop->value()); - - if ((prop = (*citer)->property (X_("name"))) == 0) { + + if ((prop = child->property (X_("name"))) == 0) { continue; } ControlProtocolInfo* cpi = cpi_by_name (prop->value()); - + if (cpi) { cpi->state = new XMLNode (**citer); - + if (active) { if (_session) { instantiate (*cpi); @@ -478,3 +504,21 @@ ControlProtocolManager::midi_connectivity_established () (*p)->midi_connectivity_established (); } } + +void +ControlProtocolManager::register_request_buffer_factories () +{ + Glib::Threads::Mutex::Lock lm (protocols_lock); + + for (list::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) { + + if ((*i)->descriptor == 0) { + warning << string_compose (_("Control protocol \"%1\" has no descriptor"), (*i)->name) << endmsg; + continue; + } + + if ((*i)->descriptor->request_buffer_factory) { + EventLoop::register_request_buffer_factory ((*i)->descriptor->name, (*i)->descriptor->request_buffer_factory); + } + } +}