X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcontrol_protocol_manager.cc;h=c2929a396870a5dc1ba660812f70f97f51570832;hb=8c04457be14673385287def048c387b3953fa8e8;hp=9f6216062adb6a54bdf3758db5d84577a7cdf68e;hpb=17ace643e4edbec1e5bd7b446d039f8c94beef75;p=ardour.git diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 9f6216062a..c2929a3968 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -32,16 +32,33 @@ #include "ardour/control_protocol_manager.h" #include "ardour/search_paths.h" - +#include "ardour/selection.h" +#include "ardour/session.h" 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"); +PBD::Signal1 ControlProtocolManager::StripableSelectionChanged; + +ControlProtocolInfo::~ControlProtocolInfo () +{ + if (protocol && descriptor) { + descriptor->destroy (descriptor, protocol); + protocol = 0; + } + + delete state; state = 0; + + if (descriptor) { + delete (Glib::Module*) descriptor->module; + descriptor = 0; + } +} ControlProtocolManager::ControlProtocolManager () { @@ -49,7 +66,7 @@ ControlProtocolManager::ControlProtocolManager () ControlProtocolManager::~ControlProtocolManager() { - Glib::Threads::Mutex::Lock lm (protocols_lock); + Glib::Threads::RWLock::WriterLock lm (protocols_lock); for (list::iterator i = control_protocols.begin(); i != control_protocols.end(); ++i) { delete (*i); @@ -59,6 +76,7 @@ ControlProtocolManager::~ControlProtocolManager() for (list::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) { + (*p)->protocol = 0; // protocol was already destroyed above. delete (*p); } @@ -70,8 +88,12 @@ ControlProtocolManager::set_session (Session* s) { SessionHandlePtr::set_session (s); - if (_session) { - Glib::Threads::Mutex::Lock lm (protocols_lock); + if (!_session) { + return; + } + + { + Glib::Threads::RWLock::ReaderLock lm (protocols_lock); for (list::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) { if ((*i)->requested || (*i)->mandatory) { @@ -79,6 +101,21 @@ ControlProtocolManager::set_session (Session* s) } } } + + CoreSelection::StripableAutomationControls sac; + _session->selection().get_stripables (sac); + + if (!sac.empty()) { + StripableNotificationListPtr v (new StripableNotificationList); + for (CoreSelection::StripableAutomationControls::iterator i = sac.begin(); i != sac.end(); ++i) { + if ((*i).stripable) { + v->push_back (boost::weak_ptr ((*i).stripable)); + } + } + if (!v->empty()) { + StripableSelectionChanged (v); /* EMIT SIGNAL */ + } + } } int @@ -111,7 +148,10 @@ ControlProtocolManager::activate (ControlProtocolInfo& cpi) cp->set_state (XMLNode(""), Stateful::loading_state_version); } - cp->set_active (true); + if (cp->set_active (true)) { + error << string_compose (_("Control protocol support for %1 failed to activate"), cpi.name) << endmsg; + teardown (cpi, false); + } return 0; } @@ -120,7 +160,7 @@ int ControlProtocolManager::deactivate (ControlProtocolInfo& cpi) { cpi.requested = false; - return teardown (cpi); + return teardown (cpi, true); } void @@ -139,7 +179,7 @@ ControlProtocolManager::drop_protocols () * before the process cycle stops and ports vanish. */ - Glib::Threads::Mutex::Lock lm (protocols_lock); + Glib::Threads::RWLock::WriterLock lm (protocols_lock); for (list::iterator p = control_protocols.begin(); p != control_protocols.end(); ++p) { delete *p; @@ -153,6 +193,7 @@ ControlProtocolManager::drop_protocols () if ((*p)->protocol) { (*p)->requested = true; (*p)->protocol = 0; + ProtocolStatusChange (*p); /* EMIT SIGNAL */ } } } @@ -190,7 +231,7 @@ ControlProtocolManager::instantiate (ControlProtocolInfo& cpi) } int -ControlProtocolManager::teardown (ControlProtocolInfo& cpi) +ControlProtocolManager::teardown (ControlProtocolInfo& cpi, bool lock_required) { if (!cpi.protocol) { @@ -220,12 +261,19 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi) delete cpi.state; cpi.state = new XMLNode (cpi.protocol->get_state()); - cpi.state->add_property (X_("active"), "no"); + cpi.state->set_property (X_("active"), false); cpi.descriptor->destroy (cpi.descriptor, cpi.protocol); - { - Glib::Threads::Mutex::Lock lm (protocols_lock); + if (lock_required) { + Glib::Threads::RWLock::WriterLock lm (protocols_lock); + list::iterator p = find (control_protocols.begin(), control_protocols.end(), cpi.protocol); + if (p != control_protocols.end()) { + control_protocols.erase (p); + } else { + cerr << "Programming error: ControlProtocolManager::teardown() called for " << cpi.name << ", but it was not found in control_protocols" << endl; + } + } else { list::iterator p = find (control_protocols.begin(), control_protocols.end(), cpi.protocol); if (p != control_protocols.end()) { control_protocols.erase (p); @@ -236,8 +284,14 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi) cpi.protocol = 0; - delete cpi.state; - cpi.state = 0; + if (lock_required) { + /* the lock is only required when the protocol is torn down from the GUI. + * If a user disables a protocol, we take this as indicator to forget the + * state. + */ + delete cpi.state; + cpi.state = 0; + } 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 @@ -257,7 +311,7 @@ ControlProtocolManager::load_mandatory_protocols () return; } - Glib::Threads::Mutex::Lock lm (protocols_lock); + Glib::Threads::RWLock::ReaderLock lm (protocols_lock); for (list::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) { if ((*i)->mandatory && ((*i)->protocol == 0)) { @@ -330,8 +384,7 @@ ControlProtocolManager::control_protocol_discover (string path) if ((descriptor = get_descriptor (path)) != 0) { if (!descriptor->probe (descriptor)) { - DEBUG_TRACE (DEBUG::ControlProtocols, - string_compose (_("Control protocol %1 not usable"), descriptor->name)); + warning << string_compose (_("Control protocol %1 not usable"), descriptor->name) << endmsg; } else { ControlProtocolInfo* cpi = new ControlProtocolInfo (); @@ -410,9 +463,8 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/) { XMLNodeList clist; XMLNodeConstIterator citer; - XMLProperty const * prop; - Glib::Threads::Mutex::Lock lm (protocols_lock); + Glib::Threads::RWLock::WriterLock lm (protocols_lock); clist = node.children(); @@ -421,34 +473,40 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/) if (child->name() == X_("Protocol")) { - if ((prop = child->property (X_("active"))) == 0) { + bool active; + std::string name; + if (!child->get_property (X_("active"), active) || + !child->get_property (X_("name"), name)) { continue; } - bool active = string_is_affirmative (prop->value()); - - if ((prop = child->property (X_("name"))) == 0) { - continue; - } - - ControlProtocolInfo* cpi = cpi_by_name (prop->value()); + ControlProtocolInfo* cpi = cpi_by_name (name); if (cpi) { - cpi->state = new XMLNode (**citer); +#ifndef NDEBUG + std::cerr << "protocol " << name << " active ? " << active << std::endl; +#endif if (active) { + delete cpi->state; + cpi->state = new XMLNode (**citer); if (_session) { instantiate (*cpi); } else { cpi->requested = true; } } else { + if (!cpi->state) { + cpi->state = new XMLNode (**citer); + cpi->state->set_property (X_("active"), false); + } + cpi->requested = false; if (_session) { - teardown (*cpi); - } else { - cpi->requested = false; + teardown (*cpi, false); } } + } else { + std::cerr << "protocol " << name << " not found\n"; } } } @@ -460,22 +518,22 @@ XMLNode& ControlProtocolManager::get_state () { XMLNode* root = new XMLNode (state_node_name); - Glib::Threads::Mutex::Lock lm (protocols_lock); + Glib::Threads::RWLock::ReaderLock lm (protocols_lock); for (list::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) { if ((*i)->protocol) { XMLNode& child_state ((*i)->protocol->get_state()); - child_state.add_property (X_("active"), "yes"); + child_state.set_property (X_("active"), true); root->add_child_nocopy (child_state); } else if ((*i)->state) { XMLNode* child_state = new XMLNode (*(*i)->state); - child_state->add_property (X_("active"), "no"); + child_state->set_property (X_("active"), false); root->add_child_nocopy (*child_state); } else { XMLNode* child_state = new XMLNode (X_("Protocol")); - child_state->add_property (X_("name"), (*i)->name); - child_state->add_property (X_("active"), "no"); + child_state->set_property (X_("name"), (*i)->name); + child_state->set_property (X_("active"), false); root->add_child_nocopy (*child_state); } @@ -498,7 +556,7 @@ ControlProtocolManager::instance () void ControlProtocolManager::midi_connectivity_established () { - Glib::Threads::Mutex::Lock lm (protocols_lock); + Glib::Threads::RWLock::ReaderLock lm (protocols_lock); for (list::iterator p = control_protocols.begin(); p != control_protocols.end(); ++p) { (*p)->midi_connectivity_established (); @@ -508,7 +566,7 @@ ControlProtocolManager::midi_connectivity_established () void ControlProtocolManager::register_request_buffer_factories () { - Glib::Threads::Mutex::Lock lm (protocols_lock); + Glib::Threads::RWLock::ReaderLock lm (protocols_lock); for (list::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) { @@ -522,3 +580,26 @@ ControlProtocolManager::register_request_buffer_factories () } } } + +void +ControlProtocolManager::stripable_selection_changed (StripableNotificationListPtr sp) +{ + /* this sets up the (static) data structures owned by ControlProtocol + that are "shared" across all control protocols. + */ + + DEBUG_TRACE (DEBUG::Selection, string_compose ("Surface manager: selection changed, now %1 stripables\n", sp ? sp->size() : -1)); + StripableSelectionChanged (sp); /* EMIT SIGNAL */ + + /* now give each protocol the chance to respond to the selection change + */ + + { + Glib::Threads::RWLock::ReaderLock lm (protocols_lock); + + for (list::iterator p = control_protocols.begin(); p != control_protocols.end(); ++p) { + DEBUG_TRACE (DEBUG::Selection, string_compose ("selection change notification for surface \"%1\"\n", (*p)->name())); + (*p)->stripable_selection_changed (); + } + } +}