From 6089ae9314e91b83099dbdba48929a0a11478bd6 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 14 Jul 2022 16:36:56 +0200 Subject: [PATCH] Use group_override_inverts preference in the GUI --- gtk2_ardour/gain_meter.cc | 6 +++++- gtk2_ardour/route_ui.cc | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index c56f8429f8..5e101dac77 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -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); } diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 369a80be5a..ff3610bd6f 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -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 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());