summaryrefslogtreecommitdiff
path: root/libs/evoral/src/Control.cpp
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/evoral/src/Control.cpp
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/evoral/src/Control.cpp')
-rw-r--r--libs/evoral/src/Control.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/evoral/src/Control.cpp b/libs/evoral/src/Control.cpp
index 75b038f1d4..e5301b833c 100644
--- a/libs/evoral/src/Control.cpp
+++ b/libs/evoral/src/Control.cpp
@@ -35,7 +35,7 @@ Control::Control(const Parameter& parameter, boost::shared_ptr<ControlList> list
/** Get the currently effective value (ie the one that corresponds to current output)
*/
float
-Control::get_value(bool from_list, nframes_t frame) const
+Control::get_float(bool from_list, nframes_t frame) const
{
if (from_list)
return _list->eval(frame);
@@ -45,7 +45,7 @@ Control::get_value(bool from_list, nframes_t frame) const
void
-Control::set_value(float value, bool to_list, nframes_t frame)
+Control::set_float(float value, bool to_list, nframes_t frame)
{
_user_value = value;
@@ -61,7 +61,7 @@ Control::set_value(float value, bool to_list, nframes_t frame)
* to the AutomationList.
*/
float
-Control::user_value() const
+Control::user_float() const
{
return _user_value;
}