smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

no-op: move method order in file

Browse source
This commit is contained in:
Paul Davis 2017-02-24 12:03:38 +01:00
parent cd609fb9d8
commit 74548604be
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libs/ardour/slavable_automation_control.cc
View file

@ -95,6 +95,20 @@ SlavableAutomationControl::get_value_locked() const
return Control::get_double() * get_masters_value_locked (); 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 void
SlavableAutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd) 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); 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 void
SlavableAutomationControl::add_master (boost::shared_ptr<AutomationControl> m, bool loading) SlavableAutomationControl::add_master (boost::shared_ptr<AutomationControl> m, bool loading)
{ {