Somewhat uncertain fix to playhead misbehaviour in rewind.

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

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 1460c42c7bd75420089b5f37c21657a5cf810e97..a1611337fd78f07262a7f272080c8b10289845de 100644 (file)
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -34,28 +34,34 @@ 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
+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());
 }
 
-
 void
-AutomationControl::set_value(float value)
+AutomationControl::set_value(double value)
 {
        bool to_list = _list && _session.transport_stopped()
                && ((AutomationList*)_list.get())->automation_write();
+ 
+        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_float(value, to_list, _session.transport_frame());
+       Control::set_double (value, to_list, _session.transport_frame());
 
        Changed(); /* EMIT SIGNAL */
 }