diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-23 00:05:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-23 00:05:25 +0000 |
| commit | f2373dc89bb62c44c585273c9ebe1809f9643371 (patch) | |
| tree | 7c9c1eea9a52a90d4d014e14fa102ae8bd5ccaf1 | |
| parent | 08910b2783c39987d8476716f25b620e1eac0c10 (diff) | |
revert inadvertent broken changes in rev 9748 that broke route group gain control
git-svn-id: svn://localhost/ardour2/branches/3.0@9763 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index b671d5674a..33688fb339 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -395,12 +395,13 @@ void GainMeterBase::gain_adjusted () { if (!ignore_toggle) { - if (_is_midi) { - _amp->set_gain (gain_adjustment.get_value(), this); + if (_route && _route->amp() == _amp) { + if (_is_midi) { + _route->set_gain (gain_adjustment.get_value(), this); + } else { + _route->set_gain (slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain()), this); + } } else { - cerr << "reset gain using slider pos " << gain_adjustment.get_value() << " to " - << slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain()) - << endl; _amp->set_gain (slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain()), this); } } |