X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_control.cc;h=a1611337fd78f07262a7f272080c8b10289845de;hb=6be56d78b199452e5dba726f2d7aaab2777d2b49;hp=8f8e40a641db74346d636f0083210be62c9ab3d9;hpb=24ccaac67e9d416b3f3c564a441934313f3e9a21;p=ardour.git

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 8f8e40a641..a1611337fd 100644
--- 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: Dave 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,67 +19,58 @@
 */
 
 #include <iostream>
-#include <ardour/automation_control.h>
-#include <ardour/session.h>
-#include <ardour/automatable.h>
+#include "ardour/automatable.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->param_id().to_string() : name)
+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)
-	, _list(list)
-	, _user_value(list->default_value())
 {
-	cerr << "Created AutomationControl " << name << "(" << list->param_id().to_string() << ")" << endl;
 }
 
-
-/** Get the currently effective value (ie the one that corresponds to current output)
- */
-float
+double
 AutomationControl::get_value() const
 {
-	if (_list->automation_playback())
-		return _list->eval(_session.transport_frame());
-	else
-		return _user_value;
+	bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
+	return Control::get_double (from_list, _session.transport_frame());
 }
 
-
 void
-AutomationControl::set_value(float value)
+AutomationControl::set_value(double value)
 {
-	_user_value = value;
-	
-	if (_session.transport_stopped() && _list->automation_write())
-		_list->add(_session.transport_frame(), value);
+	bool to_list = _list && _session.transport_stopped()
+		&& ((AutomationList*)_list.get())->automation_write();
+ 
+        if (to_list && parameter().toggled()) {
 
-	Changed(); /* EMIT SIGNAL */
-}
+                // 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());
 
-/** Get the latest user-set value, which may not equal get_value() when automation
- * is playing back, etc.
- *
- * Automation write/touch works by periodically sampling this value and adding it
- * to the AutomationList.
- */
-float
-AutomationControl::user_value() const
-{
-	return _user_value;
+	Changed(); /* EMIT SIGNAL */
 }
-	
+
 
 void
-AutomationControl::set_list(boost::shared_ptr<ARDOUR::AutomationList> list)
+AutomationControl::set_list(boost::shared_ptr<Evoral::ControlList> list)
 {
-	_list = list;
-	_user_value = list->default_value();
+	Control::set_list(list);
 	Changed();  /* EMIT SIGNAL */
 }