13
0

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
This commit is contained in:
Paul Davis 2011-06-23 00:05:25 +00:00
parent 08910b2783
commit f2373dc89b

View File

@ -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);
}
}