Use group_override_inverts preference in the GUI

This commit is contained in:
Robin Gareus 2022-07-14 16:36:56 +02:00
parent e1c6a19d06
commit 6089ae9314
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 9 additions and 3 deletions

View File

@ -584,7 +584,11 @@ GainMeterBase::fader_moved ()
}
if (Keyboard::the_keyboard().modifier_state() == Keyboard::group_override_modifier ()) {
_control->set_value (value, Controllable::InverseGroup);
if (Config->get_group_override_inverts ()) {
_control->set_value (value, Controllable::InverseGroup);
} else {
_control->set_value (value, Controllable::NoGroup);
}
} else {
_control->set_value (value, Controllable::UseGroup);
}

View File

@ -108,6 +108,8 @@ std::string RouteUI::program_port_prefix;
RouteUI::IOSelectorMap RouteUI::input_selectors;
RouteUI::IOSelectorMap RouteUI::output_selectors;
#define GROUP_ACTION (Config->get_group_override_inverts () ? Controllable::InverseGroup : Controllable::NoGroup)
void
RouteUI::delete_ioselector (IOSelectorMap& m, boost::shared_ptr<ARDOUR::Route> r)
{
@ -802,7 +804,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
rl.reset (new RouteList);
rl->push_back (_route);
_session->set_controls (route_list_to_control_list (rl, &Stripable::rec_enable_control), !track()->rec_enable_control()->get_value(), Controllable::InverseGroup);
_session->set_controls (route_list_to_control_list (rl, &Stripable::rec_enable_control), !track()->rec_enable_control()->get_value(), GROUP_ACTION);
}
} else if (Keyboard::is_context_menu_event (ev)) {
@ -909,7 +911,7 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
/* Tertiary-click overrides group */
rl.reset (new RouteList);
rl->push_back (route());
_session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::InverseGroup);
_session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, GROUP_ACTION);
} else {
rl.reset (new RouteList);
rl->push_back (route());