ardour/livetrax
13
0
Fork 0
Code

improved and hopefully correct fix for "setting AutomationControl marks session dirty even when it should not, if in playback mode"

Browse Source 
Hopefully comment is more explanatory as well.
This commit is contained in:
Paul Davis 2016-10-16 15:50:41 -04:00
parent 7e5e95d7db
commit d2835bc802
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libs/ardour/automation_control.cc
View File

@ -119,20 +119,41 @@ AutomationControl::set_value (double val, PBD::Controllable::GroupControlDisposi
void void
AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd) AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd)
{ {
bool to_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_write(); boost::shared_ptr<AutomationList> al = boost::dynamic_pointer_cast<AutomationList> (_list);
/* We cannot use ::get_value() here since that is virtual, const framepos_t pos = _session.transport_frame();
and its return value will/may depend on the ordering bool to_list;
of a derived class' own implementation of ::actually_set_value(). double old_value;
The derived classes generally need to set their own internal state /* We cannot use ::get_value() here since that is virtual, and intended
before calling this version, which means that ::get_value() to return a scalar value that in some way reflects the state of the
would generally return the *NEW* state, and thus lead to control (with semantics defined by the control itself, since it's
Changed() not being emitted below. internal state may be more complex than can be fully represented by
a single scalar).
This method's only job is to set the "user_double()" value of the
underlying Evoral::Control object, and so we should compare the new
value we're being given to the current user_double().
Unless ... we're doing automation playback, in which case the
current effective value of the control (used to determine if
anything has changed) is the one derived from the automation event
list.
*/ */
const double old_value = Control::user_double (); if (!al) {
to_list = false;
old_value = Control::user_double();
} else {
if (al->automation_write ()) {
to_list = true;
old_value = Control::user_double ();
} else if (al->automation_playback()) {
to_list = false;
old_value = al->eval (pos);
}
}
Control::set_double (value, _session.transport_frame(), to_list); Control::set_double (value, pos, to_list);
if (old_value != value) { if (old_value != value) {
// AutomationType at = (AutomationType) _parameter.type(); // AutomationType at = (AutomationType) _parameter.type();