smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

mackie: consistent use of Shift to mean "InverseGroup"

Browse source
This commit is contained in:
Paul Davis 2016-01-31 22:42:29 -05:00
parent de29ed02bc
commit c66d7e8cf9
1 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

47
libs/surfaces/mackie/strip.cc
View file

@ -817,18 +817,25 @@ Strip::vselect_event (Button&, ButtonState bs)
return; return;
} }
Controllable::GroupControlDisposition gcd;
if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
gcd = Controllable::InverseGroup;
} else {
gcd = Controllable::UseGroup;
}
if (control->toggled()) { if (control->toggled()) {
if (control->toggled()) { if (control->toggled()) {
control->set_value (!control->get_value(), Controllable::UseGroup); control->set_value (!control->get_value(), gcd);
} }
} else if (control->desc().enumeration || control->desc().integer_step) { } else if (control->desc().enumeration || control->desc().integer_step) {
double val = control->get_value (); double val = control->get_value ();
if (val <= control->upper() - 1.0) { if (val <= control->upper() - 1.0) {
control->set_value (val + 1.0, Controllable::UseGroup); control->set_value (val + 1.0, gcd);
} else { } else {
control->set_value (control->lower(), Controllable::UseGroup); control->set_value (control->lower(), gcd);
} }
} }
@ -849,7 +856,15 @@ Strip::vselect_event (Button&, ButtonState bs)
if (control) { if (control) {
bool currently_enabled = (bool) control->get_value(); bool currently_enabled = (bool) control->get_value();
control->set_value (!currently_enabled, Controllable::UseGroup); Controllable::GroupControlDisposition gcd;
if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
gcd = Controllable::InverseGroup;
} else {
gcd = Controllable::UseGroup;
}
control->set_value (!currently_enabled, gcd);
if (currently_enabled) { if (currently_enabled) {
/* we just turned it off */ /* we just turned it off */
@ -889,8 +904,16 @@ Strip::vselect_event (Button&, ButtonState bs)
if (_route) { if (_route) {
boost::shared_ptr<AutomationControl> ac = _route->master_send_enable_controllable (); boost::shared_ptr<AutomationControl> ac = _route->master_send_enable_controllable ();
if (ac) { if (ac) {
Controllable::GroupControlDisposition gcd;
if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
gcd = Controllable::InverseGroup;
} else {
gcd = Controllable::UseGroup;
}
bool enabled = ac->get_value(); bool enabled = ac->get_value();
ac->set_value (!enabled, Controllable::UseGroup); ac->set_value (!enabled, gcd);
} }
#else #else
DEBUG_TRACE (DEBUG::MackieControl, "switching to next pot mode\n"); DEBUG_TRACE (DEBUG::MackieControl, "switching to next pot mode\n");
@ -1149,7 +1172,7 @@ Strip::handle_fader (Fader& fader, float position)
Controllable::GroupControlDisposition gcd = Controllable::UseGroup; Controllable::GroupControlDisposition gcd = Controllable::UseGroup;
if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) { if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
gcd = Controllable::NoGroup; gcd = Controllable::InverseGroup;
} }
fader.set_value (position, gcd); fader.set_value (position, gcd);
@ -1179,14 +1202,22 @@ Strip::handle_pot (Pot& pot, float delta)
return; return;
} }
Controllable::GroupControlDisposition gcd;
if (_surface->mcp().main_modifier_state() & MackieControlProtocol::MODIFIER_SHIFT) {
gcd = Controllable::InverseGroup;
} else {
gcd = Controllable::UseGroup;
}
if (ac->toggled()) { if (ac->toggled()) {
/* make it like a single-step, directional switch */ /* make it like a single-step, directional switch */
if (delta > 0) { if (delta > 0) {
pot.set_value (1.0); ac->set_value (1.0, gcd);
} else { } else {
pot.set_value (0.0); ac->set_value (0.0, gcd);
} }
} else if (ac->desc().enumeration || ac->desc().integer_step) { } else if (ac->desc().enumeration || ac->desc().integer_step) {