force IFS=/ when calling path_expand, so that whitespace in paths doesn't cause worde...

[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 662d41064afcc0a3f4c6c8de80be05da2d801f73..6a8dd77d55c21a890c14f912c06640bba2c37599 100644 (file)
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -25,6 +25,7 @@
 
 #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"
@@ -73,7 +74,7 @@ ControlProtocolManager::set_session (Session* s)
                        if ((*i)->requested || (*i)->mandatory) {
                                instantiate (**i);
                                (*i)->requested = false;
-                               
+
                                if ((*i)->protocol && (*i)->state) {
                                        (*i)->protocol->set_state (*(*i)->state, Stateful::loading_state_version);
                                }
@@ -176,7 +177,8 @@ ControlProtocolManager::load_mandatory_protocols ()
 
        for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
                if ((*i)->mandatory && ((*i)->protocol == 0)) {
-                       info << string_compose (_("Instantiating mandatory control protocol %1"), (*i)->name) << endmsg;
+                       DEBUG_TRACE (DEBUG::ControlProtocols,
+                                    string_compose (_("Instantiating mandatory control protocol %1"), (*i)->name));
                        instantiate (**i);
                }
        }
@@ -196,8 +198,9 @@ ControlProtocolManager::discover_control_protocols ()
        find_matching_files_in_search_path (control_protocol_search_path (),
                        dylib_extension_pattern, cp_modules);
 
-       info << string_compose (_("looking for control protocols in %1"), control_protocol_search_path().to_string()) << endmsg;
-
+       DEBUG_TRACE (DEBUG::ControlProtocols, 
+                    string_compose (_("looking for control protocols in %1"), 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());
        }
@@ -211,7 +214,8 @@ ControlProtocolManager::control_protocol_discover (string path)
        if ((descriptor = get_descriptor (path)) != 0) {
 
                if (!descriptor->probe (descriptor)) {
-                       info << string_compose (_("Control protocol %1 not usable"), descriptor->name) << endmsg;
+                       DEBUG_TRACE (DEBUG::ControlProtocols,
+                                    string_compose (_("Control protocol %1 not usable"), descriptor->name));
                } else {
 
                        ControlProtocolInfo* cpi = new ControlProtocolInfo ();
@@ -227,7 +231,8 @@ ControlProtocolManager::control_protocol_discover (string path)
 
                        control_protocol_info.push_back (cpi);
 
-                       info << string_compose(_("Control surface protocol discovered: \"%1\""), cpi->name) << endmsg;
+                       DEBUG_TRACE (DEBUG::ControlProtocols, 
+                                    string_compose(_("Control surface protocol discovered: \"%1\""), cpi->name));
                }
 
                dlclose (descriptor->module);
@@ -328,7 +333,7 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/)
 }
 
 XMLNode&
-ControlProtocolManager::get_state (void)
+ControlProtocolManager::get_state ()
 {
        XMLNode* root = new XMLNode (state_node_name);
        Glib::Mutex::Lock lm (protocols_lock);
@@ -342,12 +347,10 @@ ControlProtocolManager::get_state (void)
                        child->add_property (X_("active"), "yes");
                        // should we update (*i)->state here?  probably.
                        root->add_child_nocopy (*child);
-               }
-               else if ((*i)->state) {
+               } else if ((*i)->state) {
                        // keep ownership clear
                        root->add_child_copy (*(*i)->state);
-               }
-               else {
+               } else {
                        child = new XMLNode (X_("Protocol"));
                        child->add_property (X_("name"), (*i)->name);
                        child->add_property (X_("active"), "no");