ardour/livetrax
13
0
Fork 0
Code

Fix the User button for Mixbus; we use it as a button, not a modifier.

Browse Source
This commit is contained in:
Ben Loftis 2018-10-04 19:29:14 -05:00
parent b844e3f45a
commit ccccac7a10
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,11 @@ FaderPort::FaderPort (Session& s)
get_button (Loop).set_action (boost::bind (&BasicUI::add_marker, this, string()), true, ShiftDown); get_button (Loop).set_action (boost::bind (&BasicUI::add_marker, this, string()), true, ShiftDown);
get_button (Punch).set_action (boost::bind (&BasicUI::prev_marker, this), true, ShiftDown); get_button (Punch).set_action (boost::bind (&BasicUI::prev_marker, this), true, ShiftDown);
#ifdef MIXBUS
get_button (User).set_action (boost::bind (&BasicUI::next_marker, this), true, ShiftDown);
#else
get_button (User).set_action (boost::bind (&BasicUI::next_marker, this), true, ButtonState(ShiftDown|UserDown)); get_button (User).set_action (boost::bind (&BasicUI::next_marker, this), true, ButtonState(ShiftDown|UserDown));
#endif
get_button (Mute).set_action (boost::bind (&FaderPort::mute, this), true); get_button (Mute).set_action (boost::bind (&FaderPort::mute, this), true);
get_button (Solo).set_action (boost::bind (&FaderPort::solo, this), true); get_button (Solo).set_action (boost::bind (&FaderPort::solo, this), true);
@ -361,12 +365,14 @@ FaderPort::button_handler (MIDI::Parser &, MIDI::EventTwoBytes* tb)
case Rewind: case Rewind:
bs = RewindDown; bs = RewindDown;
break; break;
#ifndef MIXBUS
case User: case User:
bs = UserDown; bs = UserDown;
if (tb->value) { if (tb->value) {
start_press_timeout (button, id); start_press_timeout (button, id);
} }
break; break;
#endif
case FaderTouch: case FaderTouch:
fader_is_touched = tb->value; fader_is_touched = tb->value;
if (_current_stripable) { if (_current_stripable) {
@ -472,6 +478,7 @@ FaderPort::encoder_handler (MIDI::Parser &, MIDI::pitchbend_t pb)
} }
} }
#ifndef MIXBUS
/* if the user button was pressed, mark it as consumed so that its /* if the user button was pressed, mark it as consumed so that its
* release action has no effect. * release action has no effect.
*/ */
@ -479,6 +486,7 @@ FaderPort::encoder_handler (MIDI::Parser &, MIDI::pitchbend_t pb)
if (!Profile->get_mixbus() && (button_state & UserDown)) { if (!Profile->get_mixbus() && (button_state & UserDown)) {
consumed.insert (User); consumed.insert (User);
} }
#endif
} }
void void
@ -972,6 +980,7 @@ FaderPort::Button::set_action (string const& name, bool when_pressed, FaderPort:
if (name.empty()) { if (name.empty()) {
on_release.erase (bs); on_release.erase (bs);
} else { } else {
#ifndef MIXBUS
if (id == User) { if (id == User) {
/* if the binding is for the User button, we /* if the binding is for the User button, we
need to store the button state as it will be need to store the button state as it will be
@ -979,6 +988,7 @@ FaderPort::Button::set_action (string const& name, bool when_pressed, FaderPort:
*/ */
bs = FaderPort::ButtonState (bs|UserDown); bs = FaderPort::ButtonState (bs|UserDown);
} }
#endif
DEBUG_TRACE (DEBUG::FaderPort, string_compose ("set button %1 to action %2 on release + %3%4%5\n", id, name, bs)); 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; todo.action_name = name;
on_release[bs] = todo; on_release[bs] = todo;