diff options
| author | Jan Lentfer <jan.lentfer@web.de> | 2018-12-12 16:46:36 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2018-12-12 18:14:48 +0100 |
| commit | 5d2a03578c3f0d0f39562546bd3e4be9be08d2d4 (patch) | |
| tree | cc92aa25fa25a7a4cc410a9529e99f05282684b4 | |
| parent | 17f5fb81d2c9d2394f62169b90c15bf371b44f6c (diff) | |
LCXL: some more small tweaks
* assign Pan knob to Comp thresh as secondary function
* make cancel_all_solo and cancel_all_mute work in device mode, too
| -rw-r--r-- | libs/surfaces/launch_control_xl/controllers.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/surfaces/launch_control_xl/controllers.cc b/libs/surfaces/launch_control_xl/controllers.cc index 039084a99e..ee9ca7719b 100644 --- a/libs/surfaces/launch_control_xl/controllers.cc +++ b/libs/surfaces/launch_control_xl/controllers.cc @@ -345,23 +345,23 @@ LaunchControlXL::build_maps () boost::bind (&LaunchControlXL::button_device_long_press, this)); - if (!device_mode()) { /* mixer mode */ - MAKE_SELECT_BUTTON_PRESS(SelectLeft, 106, 46, boost::bind (&LaunchControlXL::button_select_left, this)); - MAKE_SELECT_BUTTON_PRESS(SelectRight, 107, 47, boost::bind (&LaunchControlXL::button_select_right, this)); + /* Cancel all mute / solo is available in both modes */ - //MAKE_TRACK_STATE_BUTTON_PRESS(Mute, 106, 41, boost::bind (&LaunchControlXL::button_mute, this)); - - MAKE_TRACK_STATE_BUTTON_PRESS_RELEASE_LONG(Mute, 106, 41, + MAKE_TRACK_STATE_BUTTON_PRESS_RELEASE_LONG(Mute, 106, 41, boost::bind (&LaunchControlXL::relax, this) , boost::bind (&LaunchControlXL::button_mute, this), boost::bind (&LaunchControlXL::button_mute_long_press, this)); - MAKE_TRACK_STATE_BUTTON_PRESS_RELEASE_LONG(Solo, 107, 42, + MAKE_TRACK_STATE_BUTTON_PRESS_RELEASE_LONG(Solo, 107, 42, boost::bind (&LaunchControlXL::relax, this) , boost::bind (&LaunchControlXL::button_solo, this), boost::bind (&LaunchControlXL::button_solo_long_press, this)); - //MAKE_TRACK_STATE_BUTTON_PRESS(Solo, 107, 42, boost::bind (&LaunchControlXL::button_solo, this)); + + if (!device_mode()) { /* mixer mode */ + MAKE_SELECT_BUTTON_PRESS(SelectLeft, 106, 46, boost::bind (&LaunchControlXL::button_select_left, this)); + MAKE_SELECT_BUTTON_PRESS(SelectRight, 107, 47, boost::bind (&LaunchControlXL::button_select_right, this)); + MAKE_TRACK_STATE_BUTTON_PRESS(Record, 108, 43, boost::bind (&LaunchControlXL::button_record, this)); } else { /* device mode */ @@ -866,7 +866,7 @@ LaunchControlXL::knob_pan(uint8_t n) if (buttons_down.find(Device) != buttons_down.end()) { // Device button hold #ifdef MIXBUS - ac = stripable[n]->filter_freq_controllable(true); + ac = stripable[n]->comp_threshold_controllable(); #else ac = stripable[n]->pan_width_control(); #endif |