diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-04 23:09:37 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-04 23:09:45 -0400 |
| commit | 17ace643e4edbec1e5bd7b446d039f8c94beef75 (patch) | |
| tree | dfd1d426f61cdb8bb5dd7d0dc0114c8960b761e8 /libs/ardour/control_protocol_manager.cc | |
| parent | 9b3b1d945f72324a5ee38b7053a54e9d257c41db (diff) | |
OMNIBUS COMMIT: prefer const XMLNode::property method (and provide a real one)
Diffstat (limited to 'libs/ardour/control_protocol_manager.cc')
| -rw-r--r-- | libs/ardour/control_protocol_manager.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 7423d3b5c6..9f6216062a 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -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; @@ -410,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 ((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; } |