diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-02-24 12:03:38 +0100 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-02-24 22:54:25 +0100 |
| commit | 74548604be080f01ee50824cfe12b5b542cdecf5 (patch) | |
| tree | 7bc15240f03d9402de1cd7020ac481e8ba9b6e56 /libs/ardour/slavable_automation_control.cc | |
| parent | cd609fb9d8e144366e7946eb2f82e9b6fa5527c1 (diff) | |
no-op: move method order in file
Diffstat (limited to 'libs/ardour/slavable_automation_control.cc')
| -rw-r--r-- | libs/ardour/slavable_automation_control.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libs/ardour/slavable_automation_control.cc b/libs/ardour/slavable_automation_control.cc index 36e72ba51a..63784dc3a5 100644 --- a/libs/ardour/slavable_automation_control.cc +++ b/libs/ardour/slavable_automation_control.cc @@ -95,6 +95,20 @@ SlavableAutomationControl::get_value_locked() const return Control::get_double() * get_masters_value_locked (); } +/** Get the current effective `user' value based on automation state */ +double +SlavableAutomationControl::get_value() const +{ + bool from_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_playback(); + + Glib::Threads::RWLock::ReaderLock lm (master_lock); + if (!from_list) { + return get_value_locked (); + } else { + return Control::get_double (true, _session.transport_frame()) * get_masters_value_locked(); + } +} + void SlavableAutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd) { @@ -118,20 +132,6 @@ SlavableAutomationControl::actually_set_value (double value, PBD::Controllable:: AutomationControl::actually_set_value (value, gcd); } -/** Get the current effective `user' value based on automation state */ -double -SlavableAutomationControl::get_value() const -{ - bool from_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_playback(); - - Glib::Threads::RWLock::ReaderLock lm (master_lock); - if (!from_list) { - return get_value_locked (); - } else { - return Control::get_double (true, _session.transport_frame()) * get_masters_value_locked(); - } -} - void SlavableAutomationControl::add_master (boost::shared_ptr<AutomationControl> m, bool loading) { |