Respect ignore_state_request in all cases on set_automation_state(). Fixes #3416.

git-svn-id: svn://localhost/ardour2/branches/3.0@7704 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2010-08-28 16:39:31 +00:00
parent 383597b19b
commit e7587ea0fb

View File

@@ -255,23 +255,25 @@ AutomationTimeAxisView::auto_clicked ()
void
AutomationTimeAxisView::set_automation_state (AutoState state)
{
if (!ignore_state_request) {
if (_automatable) {
_automatable->set_parameter_automation_state (_control->parameter(), state);
}
#if 0
if (_route == _automatable) { // This is a time axis for route (not region) automation
_route->set_parameter_automation_state (_control->parameter(), state);
}
if (_control->list())
_control->alist()->set_automation_state(state);
#endif
if (ignore_state_request) {
return;
}
if (_automatable) {
_automatable->set_parameter_automation_state (_control->parameter(), state);
}
#if 0
if (_route == _automatable) { // This is a time axis for route (not region) automation
_route->set_parameter_automation_state (_control->parameter(), state);
}
if (_control->list()) {
_control->alist()->set_automation_state(state);
}
#endif
if (_view) {
_view->set_automation_state (state);
/* AutomationStreamViews don't signal when their automation state changes, so handle
our updates `manually'.
*/