diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-02-19 12:53:19 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-02-19 13:22:52 -0500 |
commit | 3e1107c1571e6a95e4759d34d1996f5341dbba22 (patch) | |
tree | c076387d190de2d9d7358515c2eff09163d26453 | |
parent | a70f914c51014fac46a5e416a5ae81fb5ea24d05 (diff) |
do not needlessly keep starting touch/automation watch passes just because a command to start or stop touch was received
-rw-r--r-- | libs/ardour/automation_control.cc | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc index 2586a14b58..355b0176ce 100644 --- a/libs/ardour/automation_control.cc +++ b/libs/ardour/automation_control.cc @@ -117,15 +117,23 @@ AutomationControl::set_automation_style (AutoStyle as) void AutomationControl::start_touch(double when) { - set_touching (true); - alist()->start_touch(when); - AutomationWatch::instance().add_automation_watch (shared_from_this()); + if (!touching()) { + if (alist()->automation_state() == Touch) { + alist()->start_touch (when); + AutomationWatch::instance().add_automation_watch (shared_from_this()); + } + set_touching (true); + } } void AutomationControl::stop_touch(bool mark, double when) { - set_touching (false); - alist()->stop_touch (mark, when); - AutomationWatch::instance().remove_automation_watch (shared_from_this()); + if (touching()) { + set_touching (false); + if (alist()->automation_state() == Touch) { + alist()->stop_touch (mark, when); + AutomationWatch::instance().remove_automation_watch (shared_from_this()); + } + } } |