X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_control.cc;h=1460c42c7bd75420089b5f37c21657a5cf810e97;hb=7d96960b162d25da87c388a3083775e8770bba56;hp=bbeec65669e0f3130497971f251b52aef5e1baed;hpb=2177f008411821e7bce9ca3c306ec64c70b1c58e;p=ardour.git

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index bbeec65669..1460c42c7b 100644
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2007 Paul Davis 
+    Copyright (C) 2007 Paul Davis
     Author: Dave Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -19,73 +19,52 @@
 */
 
 #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->parameter().to_string() : name)
+AutomationControl::AutomationControl(
+		ARDOUR::Session& session,
+		const Evoral::Parameter& parameter,
+		boost::shared_ptr<ARDOUR::AutomationList> list,
+		const string& name)
+	: Controllable((name != "") ? name : EventTypeMap::instance().to_symbol(parameter))
+	, Evoral::Control(parameter, list)
 	, _session(session)
-	, _list(list)
-	, _user_value(list->default_value())
 {
-	cerr << "Created AutomationControl " << name << "(" << list->parameter().to_string() << ")" << endl;
 }
 
 
-/** Get the currently effective value (ie the one that corresponds to current output)
- */
 float
 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_float(from_list, _session.transport_frame());
 }
 
 
 void
 AutomationControl::set_value(float 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();
+
+	Control::set_float(value, to_list, _session.transport_frame());
 
 	Changed(); /* EMIT SIGNAL */
 }
 
 
-/** 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;
-}
-	
-
 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 */
 }
 
-	
-Parameter
-AutomationControl::parameter() const
-{
-	return _list->parameter();
-}