13
0

SlavableAutomationControl::get_value(), if doing automation playback, should still scale the returned value by the masters' value(s)

This commit is contained in:
Paul Davis 2017-01-21 15:01:16 +00:00
parent da081e0108
commit 2f530d4fd8

View File

@ -88,11 +88,11 @@ SlavableAutomationControl::get_value() const
{ {
bool from_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_playback(); bool from_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_playback();
Glib::Threads::RWLock::ReaderLock lm (master_lock);
if (!from_list) { if (!from_list) {
Glib::Threads::RWLock::ReaderLock lm (master_lock);
return get_value_locked (); return get_value_locked ();
} else { } else {
return Control::get_double (from_list, _session.transport_frame()); return get_masters_value_locked () * Control::get_double (from_list, _session.transport_frame());
} }
} }