summaryrefslogtreecommitdiff
path: root/libs/ardour/automation_control.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-09-28 21:20:43 +0000
committerDavid Robillard <d@drobilla.net>2008-09-28 21:20:43 +0000
commit598c3cc958a9ff90db68799adc2638b053219eef (patch)
tree6d29ce9e6e1c0b716da573bd763d1c8ffcbabb06 /libs/ardour/automation_control.cc
parentedbe4a330768c76031eaa82ed9d9aba335d00c3e (diff)
Fix shadowing problem with *Control::set_value.
Fix nasty situation when setting value on a plugin automation control that's playing back. git-svn-id: svn://localhost/ardour2/branches/3.0@3823 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/automation_control.cc')
-rw-r--r--libs/ardour/automation_control.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index afa14c3f98..769f111a23 100644
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -41,13 +41,11 @@ AutomationControl::AutomationControl(
}
-/** Get the currently effective value (ie the one that corresponds to current output)
- */
float
AutomationControl::get_value() const
{
bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
- return Control::get_value(from_list, _session.transport_frame());
+ return Control::get_float(from_list, _session.transport_frame());
}
@@ -57,7 +55,7 @@ AutomationControl::set_value(float value)
bool to_list = _list && _session.transport_stopped()
&& ((AutomationList*)_list.get())->automation_playback();
- Control::set_value(value, to_list, _session.transport_frame());
+ Control::set_float(value, to_list, _session.transport_frame());
Changed(); /* EMIT SIGNAL */
}