disallow placement of audio-locked tempi within a frame of any other.

[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 c042e4f0c0a1b9cba613bb6ba0857d3ed2b5b603..ca8f21e87959aa812cccb8831f8799e4edb9088c 100644 (file)
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -38,11 +38,27 @@ 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");
 
+
+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 ()
 {
 }
@@ -111,7 +127,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 +139,7 @@ int
 ControlProtocolManager::deactivate (ControlProtocolInfo& cpi)
 {
        cpi.requested = false;
-       return teardown (cpi);
+       return teardown (cpi, true);
 }
 
 void
@@ -168,7 +187,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;
@@ -190,7 +209,7 @@ ControlProtocolManager::instantiate (ControlProtocolInfo& cpi)
 }
 
 int
-ControlProtocolManager::teardown (ControlProtocolInfo& cpi)
+ControlProtocolManager::teardown (ControlProtocolInfo& cpi, bool lock_required)
 {
        if (!cpi.protocol) {
 
@@ -224,7 +243,7 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi)
 
        cpi.descriptor->destroy (cpi.descriptor, cpi.protocol);
 
-       {
+       if (lock_required) {
                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()) {
@@ -232,13 +251,19 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi)
                } else {
                        cerr << "Programming error: ControlProtocolManager::teardown() called for " << cpi.name << ", but it was not found in control_protocols" << endl;
                }
+       } else {
+               list<ControlProtocol*>::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;
+               }
        }
 
        cpi.protocol = 0;
 
        delete cpi.state;
        cpi.state = 0;
-       cerr << "Tear down CPI module for " << cpi.name << endl;
        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
@@ -331,8 +356,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 ();
@@ -411,30 +435,35 @@ 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) {
+                               delete cpi->state;
                                cpi->state = new XMLNode (**citer);
 
+                               std::cerr << "protocol " << prop->value() << " active ? " << active << std::endl;
+
                                if (active) {
                                        if (_session) {
                                                instantiate (*cpi);
@@ -443,11 +472,13 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/)
                                        }
                                } else {
                                        if (_session) {
-                                               teardown (*cpi);
+                                               teardown (*cpi, true);
                                        } else {
                                                cpi->requested = false;
                                        }
                                }
+                       } else {
+                               std::cerr << "protocol " << prop->value() << " not found\n";
                        }
                }
        }