diff options
author | Robin Gareus <robin@gareus.org> | 2017-06-12 02:25:20 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-06-12 02:26:23 +0200 |
commit | 333e20a3a60cccbab57957b8266ea043bb7bfb8a (patch) | |
tree | 842ce7b1d91aadfec3595ac25d96f1890c9d1d66 /libs/ardour/ardour/solo_isolate_control.h | |
parent | 3d2bbf93efe42412823722a17ae4da25db3b51f2 (diff) |
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)
Diffstat (limited to 'libs/ardour/ardour/solo_isolate_control.h')
-rw-r--r-- | libs/ardour/ardour/solo_isolate_control.h | 2 |
1 files changed, 1 insertions, 1 deletions
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<AutomationControl>); + void master_changed (bool from_self, PBD::Controllable::GroupControlDisposition gcd, boost::weak_ptr<AutomationControl>); void actually_set_value (double, PBD::Controllable::GroupControlDisposition group_override); private: |