From 3f8d0ddc3dc66b399bc416e6a19b272d759fe7b9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 23 Jul 2024 18:20:51 -0600 Subject: [PATCH] faderport: fix SNAFU caused by switching to Mixbus-style use of user button User stopped being a modifier but was still being treated as one. --- libs/surfaces/faderport/faderport.cc | 9 ++------- libs/surfaces/faderport/faderport.h | 2 +- libs/surfaces/faderport/gui.cc | 4 ---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc index b25b201298..c58c686115 100644 --- a/libs/surfaces/faderport/faderport.cc +++ b/libs/surfaces/faderport/faderport.cc @@ -321,13 +321,8 @@ FaderPort::handle_midi_pitchbend_message (MIDI::Parser &, MIDI::pitchbend_t pb) ButtonState trim_modifier; ButtonState width_modifier; - if (Profile->get_mixbus()) { - trim_modifier = ShiftDown; - width_modifier = ButtonState (0); - } else { - trim_modifier = UserDown; - width_modifier = ShiftDown; - } + trim_modifier = ShiftDown; + width_modifier = ButtonState (0); if ((button_state & trim_modifier) == trim_modifier ) { // mod+encoder = input trim std::shared_ptr trim = _current_stripable->trim_control (); diff --git a/libs/surfaces/faderport/faderport.h b/libs/surfaces/faderport/faderport.h index 88b886a3e3..62931dc15e 100644 --- a/libs/surfaces/faderport/faderport.h +++ b/libs/surfaces/faderport/faderport.h @@ -131,7 +131,7 @@ class FaderPort : public MIDISurface { ShiftDown = 0x1, RewindDown = 0x2, StopDown = 0x4, - UserDown = 0x8, + /* gap when we removed UserMode as a modifier */ LongPress = 0x10 }; diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc index 34a82aff98..a11eba78e4 100644 --- a/libs/surfaces/faderport/gui.cc +++ b/libs/surfaces/faderport/gui.cc @@ -436,10 +436,6 @@ FPGUI::build_foot_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs) void FPGUI::build_user_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs) { -#ifndef MIXBUS - bs = FaderPort::ButtonState (bs|FaderPort::UserDown); -#endif - /* set the active "row" to the right value for the current button binding */ string current_action = fp.get_action (FaderPort::User, false, bs); /* lookup release action */