From 333e20a3a60cccbab57957b8266ea043bb7bfb8a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 12 Jun 2017 02:25:20 +0200 Subject: VCA/SlavableAutomationCtrl re-design: * remember master-ctrl value on assignment & save with session * Control/AutomationCtrl only stores ctrl's own value (w/o master) * virtual AutomationControl::get_value () -> use SlavableAC method * MasterRecord uses weak-ptr (fixes recursive ~Controllable() deadlock) --- libs/ardour/ardour/solo_isolate_control.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/ardour/ardour/solo_isolate_control.h') diff --git a/libs/ardour/ardour/solo_isolate_control.h b/libs/ardour/ardour/solo_isolate_control.h index 1e49469067..190e0cdda3 100644 --- a/libs/ardour/ardour/solo_isolate_control.h +++ b/libs/ardour/ardour/solo_isolate_control.h @@ -73,7 +73,7 @@ class LIBARDOUR_API SoloIsolateControl : public SlavableAutomationControl XMLNode& get_state (); protected: - void master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd, boost::shared_ptr); + void master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd, boost::weak_ptr); void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override); private: -- cgit v1.2.3