ardour/livetrax
13
0
Fork 0
Code

clear up some stupid thinking in Amp regarding the way the underlying AutomationControl/Controllable gets set when Amp::set_gain() is called

Browse Source
This commit is contained in:
Paul Davis 2014-02-19 12:51:32 -05:00
parent 29b3c299a1
commit d024b500a6
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/ardour/amp.cc
View File

@ -372,19 +372,9 @@ Amp::inc_gain (gain_t factor, void *src)
} }
void void
Amp::set_gain (gain_t val, void *src) Amp::set_gain (gain_t val, void *)
{ {
val = min (val, max_gain_coefficient); _gain_control->set_value (val);
if (src != _gain_control.get()) {
_gain_control->set_value (val);
// bit twisty, this will come back and call us again
// (this keeps control in sync with reality)
return;
}
_gain_control->set_double (val);
_session.set_dirty();
} }
XMLNode& XMLNode&
@ -414,13 +404,8 @@ Amp::set_state (const XMLNode& node, int version)
void void
Amp::GainControl::set_value (double val) Amp::GainControl::set_value (double val)
{ {
if (val > max_gain_coefficient) { AutomationControl::set_value (min (val, (double) max_gain_coefficient));
val = max_gain_coefficient; _amp->session().set_dirty ();
}
_amp->set_gain (val, this);
AutomationControl::set_value(val);
} }
double double