mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-10 16:46:35 +01:00
Fix Monitor Group override
This commit is contained in:
parent
6cc18cef4f
commit
1794d08789
1 changed files with 7 additions and 9 deletions
|
|
@ -916,22 +916,20 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
|
if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) {
|
||||||
|
/* Primary-Tertiary-click applies change to all routes */
|
||||||
rl = _session->get_routes ();
|
rl = _session->get_routes ();
|
||||||
|
_session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::NoGroup);
|
||||||
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
|
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
|
||||||
if (_route->route_group() && _route->route_group()->is_monitoring()) {
|
/* Primary-click overrides group */
|
||||||
rl = _route->route_group()->route_list();
|
rl.reset (new RouteList);
|
||||||
} else {
|
rl->push_back (route());
|
||||||
rl.reset (new RouteList);
|
_session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::InverseGroup);
|
||||||
rl->push_back (route());
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
rl.reset (new RouteList);
|
rl.reset (new RouteList);
|
||||||
rl->push_back (route());
|
rl->push_back (route());
|
||||||
|
_session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::UseGroup);
|
||||||
}
|
}
|
||||||
|
|
||||||
_session->set_controls (route_list_to_control_list (rl, &Stripable::monitoring_control), (double) mc, Controllable::UseGroup);
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue