revert inadvertently committed debug settings

[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 8f2f026d5542c3c1a1044792fa1f2fa785cf25fc..2b0a4dce4cd71e5fb8ddb822cdbbbb9d718e35d6 100644 (file)
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -38,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");
@@ -168,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;
@@ -193,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;
        }
 
@@ -223,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);
 
@@ -332,8 +350,6 @@ ControlProtocolManager::control_protocol_discover (string path)
                        DEBUG_TRACE (DEBUG::ControlProtocols,
                                     string_compose(_("Control surface protocol discovered: \"%1\"\n"), cpi->name));
                }
-
-               delete (Glib::Module*)descriptor->module;
        }
 
        return 0;
@@ -365,8 +381,6 @@ ControlProtocolManager::get_descriptor (string path)
 
        if (descriptor) {
                descriptor->module = (void*)module;
-       } else {
-               delete module;
        }
 
        return descriptor;
@@ -396,22 +410,24 @@ 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 (child->name() == X_("Protocol")) {
 
-                       if ((prop = (*citer)->property (X_("active"))) == 0) {
+                       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;
                        }