From 8fc18766263c72a7c02593de726f304ea2f866a6 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 9 Apr 2016 16:15:26 -0400 Subject: [PATCH] do not non-automable controls to an Automatable's list of what can be automated --- libs/ardour/automatable.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index f85bc83e85..d02139b4d1 100644 --- a/libs/ardour/automatable.cc +++ b/libs/ardour/automatable.cc @@ -148,7 +148,9 @@ Automatable::add_control(boost::shared_ptr ac) boost::shared_ptr al = boost::dynamic_pointer_cast (ac->list ()); - if (al) { + boost::shared_ptr actl (boost::dynamic_pointer_cast (ac)); + + if ((!actl || !(actl->flags() & Controllable::NotAutomatable)) && al) { al->automation_state_changed.connect_same_thread ( _list_connections, boost::bind (&Automatable::automation_list_automation_state_changed, @@ -157,7 +159,7 @@ Automatable::add_control(boost::shared_ptr ac) ControlSet::add_control (ac); - if (al) { + if ((!actl || !(actl->flags() & Controllable::NotAutomatable)) && al) { _can_automate_list.insert (param); automation_list_automation_state_changed (param, al->automation_state ()); // sync everything up }