smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

Use XMLNode::get/set_property API in PBD::ConfigurationVariable class

Browse source
This commit is contained in:
Tim Mayberry 2016-08-26 21:10:04 +10:00
parent b320ba1aa5
commit 32f5464490
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libs/pbd/configuration_variable.cc
View file

@ -37,8 +37,8 @@ ConfigVariableBase::add_to_node (XMLNode& node)
const std::string v = get_as_string (); const std::string v = get_as_string ();
DEBUG_TRACE (DEBUG::Configuration, string_compose ("Config variable %1 stored as [%2]\n", _name, v)); DEBUG_TRACE (DEBUG::Configuration, string_compose ("Config variable %1 stored as [%2]\n", _name, v));
XMLNode* child = new XMLNode ("Option"); XMLNode* child = new XMLNode ("Option");
child->add_property ("name", _name); child->set_property ("name", _name);
child->add_property ("value", v); child->set_property ("value", v);
node.add_child_nocopy (*child); node.add_child_nocopy (*child);
} }
@ -49,10 +49,10 @@ ConfigVariableBase::set_from_node (XMLNode const & node)
/* ardour.rc */ /* ardour.rc */
const XMLProperty* prop;
XMLNodeList nlist; XMLNodeList nlist;
XMLNodeConstIterator niter; XMLNodeConstIterator niter;
XMLNode const * child; XMLNode const * child;
std::string str;
nlist = node.children(); nlist = node.children();
@ -61,13 +61,11 @@ ConfigVariableBase::set_from_node (XMLNode const & node)
child = *niter; child = *niter;
if (child->name() == "Option") { if (child->name() == "Option") {
if ((prop = child->property ("name")) != 0) { if (child->get_property ("name", str) && str == _name) {
if (prop->value() == _name) { if (child->get_property ("value", str)) {
if ((prop = child->property ("value")) != 0) { set_from_string (str);
set_from_string (prop->value());
return true;
}
} }
return true;
} }
} }
} }
@ -79,7 +77,7 @@ ConfigVariableBase::set_from_node (XMLNode const & node)
XMLNodeList olist; XMLNodeList olist;
XMLNodeConstIterator oiter; XMLNodeConstIterator oiter;
XMLNode* option; XMLNode* option;
const XMLProperty* opt_prop; std::string str;
olist = node.children(); olist = node.children();
@ -88,8 +86,8 @@ ConfigVariableBase::set_from_node (XMLNode const & node)
option = *oiter; option = *oiter;
if (option->name() == _name) { if (option->name() == _name) {
if ((opt_prop = option->property ("val")) != 0) { if (option->get_property ("val", str)) {
set_from_string (opt_prop->value()); set_from_string (str);
return true; return true;
} }
} }