diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-18 10:52:15 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-18 12:11:09 -0500 |
| commit | 64c9198d602a86cf584cf84157470edd1ee2caf0 (patch) | |
| tree | 9665c19cede3adbebbac2100e4a583f687d8f359 /gtk2_ardour | |
| parent | 1948b50a68381d7ffb14a88ffcf6da2c910bc012 (diff) | |
add group disposition argument to Route::set_gain() and use it in various UIs
Executive decisions were necessary in a couple of places about the correct group disposition
behaviour, notably faderport and OSC surfaces
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_actor.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 7fa9bf88de..5a2047cf73 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -532,7 +532,7 @@ GainMeterBase::gain_adjusted () if (!ignore_toggle) { if (_route && _route->amp() == _amp) { - _route->set_gain (value, this); + _route->set_gain (value, Controllable::UseGroup); } else { _amp->gain_control()->set_value (value, Controllable::NoGroup); } diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc index ffd68ff6c4..87a4d014e6 100644 --- a/gtk2_ardour/mixer_actor.cc +++ b/gtk2_ardour/mixer_actor.cc @@ -176,7 +176,7 @@ printf("setting gain to unity (?)"); BOOST_FOREACH(RouteUI* r, _route_targets) { boost::shared_ptr<Route> rp = r->route(); if (rp) { - rp->set_gain (1.0, this); + rp->set_gain (1.0, Controllable::NoGroup); } } } diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index a3fa56945d..059f20a885 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1949,25 +1949,25 @@ RouteUI::parameter_changed (string const & p) void RouteUI::step_gain_up () { - _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.1), this); + _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.1), Controllable::UseGroup); } void RouteUI::page_gain_up () { - _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.5), this); + _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) + 0.5), Controllable::UseGroup); } void RouteUI::step_gain_down () { - _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.1), this); + _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.1), Controllable::UseGroup); } void RouteUI::page_gain_down () { - _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), this); + _route->set_gain (dB_to_coefficient (accurate_coefficient_to_dB (_route->gain_control()->get_value()) - 0.5), Controllable::UseGroup); } void |