X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomation_control.cc;h=055c000bc9b9fec97a0a74389fa48cd19c206bfd;hb=293ab1ef53ae66c862b3ff6708071c37d6fa12eb;hp=03871cf07c09616a824d6c2f384762098203bb34;hpb=c104c9d4726f3ba1ecd352d13b88a57f2f964510;p=ardour.git

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 03871cf07c..055c000bc9 100644
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -30,6 +30,8 @@
 #include "ardour/control_group.h"
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
+#include "ardour/selection.h"
+#include "ardour/value_as_string.h"
 
 #include "pbd/i18n.h"
 
@@ -60,10 +62,15 @@ AutomationControl::AutomationControl(ARDOUR::Session&                          s
 	if (_desc.toggled) {
 		set_flags (Controllable::Toggle);
 	}
+	boost::shared_ptr<AutomationList> al = alist();
+	if (al) {
+		al->StateChanged.connect_same_thread (_state_changed_connection, boost::bind (&Session::set_dirty, &_session));
+	}
 }
 
 AutomationControl::~AutomationControl ()
 {
+	_session.selection().remove_control_by_id (id());
 	DropReferences (); /* EMIT SIGNAL */
 }
 
@@ -85,6 +92,23 @@ AutomationControl::get_value() const
 	return Control::get_double (from_list, _session.transport_frame());
 }
 
+double
+AutomationControl::get_save_value() const
+{
+	/* save user-value, not incl masters */
+	return Control::get_double ();
+}
+
+void
+AutomationControl::pre_realtime_queue_stuff (double val, PBD::Controllable::GroupControlDisposition gcd)
+{
+	if (_group && _group->use_me (gcd)) {
+		_group->pre_realtime_queue_stuff (val);
+	} else {
+		do_pre_realtime_queue_stuff (val);
+	}
+}
+
 void
 AutomationControl::set_value (double val, PBD::Controllable::GroupControlDisposition gcd)
 {
@@ -116,24 +140,59 @@ AutomationControl::set_value (double val, PBD::Controllable::GroupControlDisposi
  *  (e.g. record if necessary, etc.)
  *  @param value `user' value
  */
-bool
+void
 AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd)
 {
-	bool to_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_write();
-	const double old_value = get_value ();
+	boost::shared_ptr<AutomationList> al = boost::dynamic_pointer_cast<AutomationList> (_list);
+	const framepos_t pos = _session.transport_frame();
+	bool to_list;
+	double old_value;
+
+	/* We cannot use ::get_value() here since that is virtual, and intended
+	   to return a scalar value that in some way reflects the state of the
+	   control (with semantics defined by the control itself, since it's
+	   internal state may be more complex than can be fully represented by
+	   a single scalar).
+
+	   This method's only job is to set the "user_double()" value of the
+	   underlying Evoral::Control object, and so we should compare the new
+	   value we're being given to the current user_double().
+
+	   Unless ... we're doing automation playback, in which case the
+	   current effective value of the control (used to determine if
+	   anything has changed) is the one derived from the automation event
+	   list.
+	*/
 
-	Control::set_double (value, _session.transport_frame(), to_list);
+	if (!al) {
+		to_list = false;
+		old_value = Control::user_double();
+	} else {
+		if (al->automation_write ()) {
+			to_list = true;
+			old_value = Control::user_double ();
+		} else if (al->automation_playback()) {
+			to_list = false;
+			old_value = al->eval (pos);
+		} else {
+			to_list = false;
+			old_value = Control::user_double ();
+		}
+	}
 
-	//AutomationType at = (AutomationType) _parameter.type();
-	//std::cerr << "++++ Changed (" << enum_2_string (at) << ", " << enum_2_string (gcd) << ") = " << value
-	//<< " (was " << old_value << ") @ " << this << std::endl;
+	Control::set_double (value, pos, to_list);
 
 	if (old_value != value) {
+		//AutomationType at = (AutomationType) _parameter.type();
+		//std::cerr << "++++ Changed (" << enum_2_string (at) << ", " << enum_2_string (gcd) << ") = " << value
+		//<< " (was " << old_value << ") @ " << this << std::endl;
+
 		Changed (true, gcd);
-		return true;
+		if (!al || !al->automation_playback ()) {
+			_session.set_dirty ();
+		}
 	}
 
-	return false;
 }
 
 void
@@ -155,6 +214,7 @@ AutomationControl::set_automation_state (AutoState as)
 
 		alist()->set_automation_state (as);
 		if (_desc.toggled) {
+			Changed (false, Controllable::NoGroup); // notify slaves, update boolean masters
 			return;  // No watch for boolean automation
 		}
 
@@ -287,6 +347,12 @@ AutomationControl::interface_to_internal (double val) const
 	return val;
 }
 
+std::string
+AutomationControl::get_user_string () const
+{
+	return ARDOUR::value_as_string (_desc, get_value());
+}
+
 void
 AutomationControl::set_group (boost::shared_ptr<ControlGroup> cg)
 {