diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2019-03-20 11:15:34 -0700 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2019-03-20 11:15:34 -0700 |
| commit | 94d859e30df6d11e808382da4ca1b02e93eb2912 (patch) | |
| tree | cc80d111ce4757ae9f0ab06e79108257b20f7bac /libs/surfaces/us2400 | |
| parent | df29e57cb400243bf0cf435e78f0037cb47f5012 (diff) | |
ActionManager::get_all_actions() no longer includes <Actions> in the paths it returns, part 2 (surface support)
Diffstat (limited to 'libs/surfaces/us2400')
| -rw-r--r-- | libs/surfaces/us2400/device_profile.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/surfaces/us2400/device_profile.cc b/libs/surfaces/us2400/device_profile.cc index 7af4deead5..ffbffd34f2 100644 --- a/libs/surfaces/us2400/device_profile.cc +++ b/libs/surfaces/us2400/device_profile.cc @@ -230,12 +230,12 @@ DeviceProfile::get_button_action (Button::ID id, int modifier_state) const if (modifier_state == US2400Protocol::MODIFIER_SHIFT) { return i->second.shift; } - + return i->second.plain; } void -DeviceProfile::set_button_action (Button::ID id, int modifier_state, const string& act) +DeviceProfile::set_button_action (Button::ID id, int modifier_state, const string& action) { ButtonActionMap::iterator i = _button_map.find (id); @@ -243,9 +243,6 @@ DeviceProfile::set_button_action (Button::ID id, int modifier_state, const strin i = _button_map.insert (std::make_pair (id, ButtonActions())).first; } - string action (act); - replace_all (action, "<Actions>/", ""); - if (modifier_state == US2400Protocol::MODIFIER_SHIFT) { i->second.shift = action; } |