diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-11-30 20:54:23 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-11-30 20:54:23 -0500 |
| commit | 254c1e2c918cb615eb3d1b5b7c30fb40345b9825 (patch) | |
| tree | fd6fda0cc75a2d8620316987fbdfaeccc1bcb91b /libs/surfaces/faderport/faderport.cc | |
| parent | 41d0336f80fabeaf0301b621de434b4bb358b6c2 (diff) | |
faderport: correctly restore mix/proj/trns state from XML
Diffstat (limited to 'libs/surfaces/faderport/faderport.cc')
| -rw-r--r-- | libs/surfaces/faderport/faderport.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc index a2c3c63061..19dbfe83ce 100644 --- a/libs/surfaces/faderport/faderport.cc +++ b/libs/surfaces/faderport/faderport.cc @@ -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; |