ardour/livetrax
13
0
Fork 0
Code

faderport: correctly restore mix/proj/trns state from XML

Browse Source
This commit is contained in:
Paul Davis 2015-11-30 20:54:23 -05:00
parent 41d0336f80
commit 254c1e2c91
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/surfaces/faderport/faderport.cc
View File

@ -780,6 +780,7 @@ FaderPort::Button::set_action (string const& name, bool when_pressed, FaderPort:
if (name.empty()) {
on_press.erase (bs);
} else {
DEBUG_TRACE (DEBUG::FaderPort, string_compose ("set button %1 to action %2 on press + %3%4%5\n", id, name, bs));
todo.action_name = name;
on_press[bs] = todo;
}
@ -787,6 +788,7 @@ FaderPort::Button::set_action (string const& name, bool when_pressed, FaderPort:
if (name.empty()) {
on_release.erase (bs);
} else {
DEBUG_TRACE (DEBUG::FaderPort, string_compose ("set button %1 to action %2 on release + %3%4%5\n", id, name, bs));
todo.action_name = name;
on_release[bs] = todo;
}
@ -881,16 +883,14 @@ FaderPort::Button::set_state (XMLNode const& node)
string propname;
propname = sp->first + X_("-press");
if ((prop = node.property (propname)) == 0) {
continue;
if ((prop = node.property (propname)) != 0) {
set_action (prop->value(), true, sp->second);
}
set_action (prop->value(), true, sp->second);
propname = sp->first + X_("-release");
if ((prop = node.property (propname)) == 0) {
continue;
if ((prop = node.property (propname)) != 0) {
set_action (prop->value(), false, sp->second);
}
set_action (prop->value(), false, sp->second);
}
return 0;