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 /libs/ardour/amp.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 'libs/ardour/amp.cc')
-rw-r--r-- | libs/ardour/amp.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index 955dd13ccc..924a77e666 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -368,7 +368,7 @@ Amp::inc_gain (gain_t factor, void *src) void Amp::set_gain (gain_t val, void *) { - _gain_control->set_value (val); + _gain_control->set_value (val, Controllable::NoGroup); } XMLNode& @@ -396,7 +396,7 @@ Amp::set_state (const XMLNode& node, int version) } void -Amp::GainControl::set_value (double val) +Amp::GainControl::set_value (double val, PBD::Controllable::GroupControlDisposition /* group_override */) { if (writable()) { set_value_unchecked (val); @@ -406,7 +406,7 @@ Amp::GainControl::set_value (double val) void Amp::GainControl::set_value_unchecked (double val) { - AutomationControl::set_value (std::max (std::min (val, (double)_desc.upper), (double)_desc.lower)); + AutomationControl::set_value (std::max (std::min (val, (double)_desc.upper), (double)_desc.lower), Controllable::NoGroup); _amp->session().set_dirty (); } |