diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-02 04:58:23 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-02 04:58:30 -0500 |
commit | 9e3299f97da874a48f67dc5ff0e0f87a6a54768a (patch) | |
tree | 460d8bd46c20c72fbaac2ea917da32bb95d42124 /gtk2_ardour/ardour_knob.cc | |
parent | 38f199e35565e58d48f68eafa3e5873d9787c55c (diff) |
change Controllable::set_value() API to include grouped control consideration.
This also removes Route::group_gain_control() and associated machinery.
Not yet tested with Mackie or other surfaces. More work to done to
start using the group capabilities, and also potentially to add
or derive more controls as RouteAutomationControls
Diffstat (limited to 'gtk2_ardour/ardour_knob.cc')
-rw-r--r-- | gtk2_ardour/ardour_knob.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_knob.cc b/gtk2_ardour/ardour_knob.cc index f7e4a939f2..8cea0f4a4d 100644 --- a/gtk2_ardour/ardour_knob.cc +++ b/gtk2_ardour/ardour_knob.cc @@ -365,14 +365,14 @@ ArdourKnob::on_motion_notify_event (GdkEventMotion *ev) delta = tozero + remain; _dead_zone_delta = 0; } else { - c->set_value (c->normal()); + c->set_value (c->normal(), Controllable::NoGroup); _dead_zone_delta = remain / px_deadzone; return true; } } if (fabsf (rintf((val - _normal) / scale) + _dead_zone_delta) < 1) { - c->set_value (c->normal()); + c->set_value (c->normal(), Controllable::NoGroup); _dead_zone_delta += delta / px_deadzone; return true; } @@ -430,7 +430,7 @@ ArdourKnob::on_button_release_event (GdkEventButton *ev) if ( (_grabbed_y == ev->y && _grabbed_x == ev->x) && Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { //no move, shift-click sets to default boost::shared_ptr<PBD::Controllable> c = binding_proxy.get_controllable(); if (!c) return false; - c->set_value (c->normal()); + c->set_value (c->normal(), Controllable::NoGroup); return true; } |