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/automation_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/automation_control.h')
| -rw-r--r-- | libs/ardour/ardour/automation_control.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h index a16929afa5..9879767807 100644 --- a/libs/ardour/ardour/automation_control.h +++ b/libs/ardour/ardour/automation_control.h @@ -91,9 +91,10 @@ public: void start_touch(double when); void stop_touch(bool mark, double when); - /* inherited from PBD::Controllable. - */ - double get_value () const; + /* inherited from PBD::Controllable. */ + virtual double get_value () const; + virtual double get_save_value () const; + /* inherited from PBD::Controllable. * Derived classes MUST call ::writable() to verify * that writing to the parameter is legal at that time. |