From 2f530d4fd86b00757a3cb15765b59d3976bf5011 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 21 Jan 2017 15:01:16 +0000 Subject: SlavableAutomationControl::get_value(), if doing automation playback, should still scale the returned value by the masters' value(s) --- libs/ardour/slavable_automation_control.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/ardour/slavable_automation_control.cc') diff --git a/libs/ardour/slavable_automation_control.cc b/libs/ardour/slavable_automation_control.cc index dc7e59c387..31e81a2931 100644 --- a/libs/ardour/slavable_automation_control.cc +++ b/libs/ardour/slavable_automation_control.cc @@ -88,11 +88,11 @@ SlavableAutomationControl::get_value() const { bool from_list = _list && boost::dynamic_pointer_cast(_list)->automation_playback(); + Glib::Threads::RWLock::ReaderLock lm (master_lock); if (!from_list) { - Glib::Threads::RWLock::ReaderLock lm (master_lock); return get_value_locked (); } else { - return Control::get_double (from_list, _session.transport_frame()); + return get_masters_value_locked () * Control::get_double (from_list, _session.transport_frame()); } } -- cgit v1.2.3