Inrease the export "chunk size" to speed it up over 10% at least in some situations

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

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index a16306838a6d5f165c9c7db62bd3fd2f5bbe6e4c..05463dcdd0ce79e5b40145181a1fc8734904804c 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
@@ -19,41 +19,53 @@
 */
 
 #include <iostream>
-#include <ardour/automation_control.h>
-#include <ardour/session.h>
-#include <ardour/automatable.h>
-#include <ardour/midi_track.h>
+
+#include "ardour/automation_control.h"
+#include "ardour/event_type_map.h"
+#include "ardour/session.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-
-AutomationControl::AutomationControl(Session& session, boost::shared_ptr<AutomationList> list, string name)
-       : Controllable((name == "unnamed controllable") ? list->parameter().symbol() : name)
-       , Evoral::Control(list)
+AutomationControl::AutomationControl(
+               ARDOUR::Session& session,
+               const Evoral::Parameter& parameter,
+               boost::shared_ptr<ARDOUR::AutomationList> list,
+               const string& name)
+       : Controllable (name.empty() ? EventTypeMap::instance().to_symbol(parameter) : name)
+       , Evoral::Control(parameter, list)
        , _session(session)
 {
 }
 
-
-/** Get the currently effective value (ie the one that corresponds to current output)
- */
-float
+/** Get the current effective `user' value based on automation state */
+double
 AutomationControl::get_value() const
 {
-       bool from_list = ((AutomationList*)_list.get())->automation_playback();
-       return Control::get_value(from_list, _session.transport_frame());
+       bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
+       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 = _session.transport_stopped()
-               && ((AutomationList*)_list.get())->automation_playback();
-       
-       Control::set_value(value, to_list, _session.transport_frame());
+       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_double (value, to_list, _session.transport_frame());
 
        Changed(); /* EMIT SIGNAL */
 }