allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Use XMLNode::get/set_property API in Faderport surface

Browse Source
This commit is contained in:
Tim Mayberry
2017-04-15 12:13:39 +10:00
parent ac8b5192cd
commit 0656d5ab1a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/surfaces/faderport8/faderport8.cc
View File

@@ -694,12 +694,12 @@ FaderPort8::get_state ()
continue;
}
XMLNode* btn = new XMLNode (X_("Button"));
btn->add_property (X_("id"), name);
btn->set_property (X_("id"), name);
if (!i->second.action(true).empty ()) {
btn->add_property ("press", i->second.action(true)._action_name);
btn->set_property ("press", i->second.action(true)._action_name);
}
if (!i->second.action(false).empty ()) {
btn->add_property ("release", i->second.action(false)._action_name);
btn->set_property ("release", i->second.action(false)._action_name);
}
node.add_child_nocopy (*btn);
}
@@ -743,23 +743,23 @@ FaderPort8::set_state (const XMLNode& node, int version)
if ((*n)->name() != X_("Button")) {
continue;
}
XMLProperty const* prop = (*n)->property (X_("id"));
if (!prop) {
std::string id_str;
if (!(*n)->get_property (X_("id"), id_str)) {
continue;
}
FP8Controls::ButtonId id;
if (!_ctrls.button_name_to_enum (prop->value(), id)) {
if (!_ctrls.button_name_to_enum (id_str, id)) {
continue;
}
prop = (*n)->property (X_("press"));
if (prop) {
set_button_action (id, true, prop->value());
std::string action_str;
if ((*n)->get_property (X_("press"), action_str)) {
set_button_action (id, true, action_str);
}
prop = (*n)->property (X_("release"));
if (prop) {
set_button_action (id, false, prop->value());
if ((*n)->get_property (X_("release"), action_str)) {
set_button_action (id, false, action_str);
}
}