force IFS=/ when calling path_expand, so that whitespace in paths doesn't cause worde...

[ardour.git] / libs / ardour / automation_control.cc

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index ef54705e03b499757d2ef92931d7c76a2f07ebcb..fd4a2280377418bbb65a80df8e60da8e1394feab 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -1,6 +1,6 @@
 /*
-    Copyright (C) 2007 Paul Davis 
-    Author: Dave Robillard
+    Copyright (C) 2007 Paul Davis
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,28 +34,39 @@ AutomationControl::AutomationControl(
                const Evoral::Parameter& parameter,
                boost::shared_ptr<ARDOUR::AutomationList> list,
                const string& name)
-       : Controllable((name != "") ? name : EventTypeMap::instance().to_symbol(parameter))
+       : Controllable (name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name)
        , Evoral::Control(parameter, list)
        , _session(session)
 {
 }
 
-
-float
+/** Get the current effective `user' value based on automation state */
+double
 AutomationControl::get_value() const
 {
        bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
-       return Control::get_float(from_list, _session.transport_frame());
+       return Control::get_double (from_list, _session.transport_frame());
 }
 
-
+/** Set the value and do the right thing based on automation state
+ *  (e.g. record if necessary, etc.)
+ *  @param value `user' value
+ */
 void
-AutomationControl::set_value(float value)
+AutomationControl::set_value(double value)
 {
        bool to_list = _list && _session.transport_stopped()
                && ((AutomationList*)_list.get())->automation_write();
-       
-       Control::set_float(value, to_list, _session.transport_frame());
+
+        if (to_list && parameter().toggled()) {
+
+                // store the previous value just before this so any
+                // interpolation works right
+
+                _list->add (get_double(), _session.transport_frame()-1);
+        }
+
+       Control::set_double (value, to_list, _session.transport_frame());
 
        Changed(); /* EMIT SIGNAL */
 }