X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fautomation_control.cc;h=e27da6ab08797f30badbec995de59bb33a57b136;hp=3629345d941e7a9efe06fc805df15080ea07a939;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=489753e866eba93e1263f61b716c31ca80a32181

diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 3629345d94..e27da6ab08 100644
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -20,15 +20,18 @@
 
 #include <math.h>
 #include <iostream>
+
+#include "pbd/memento_command.h"
+#include "pbd/stacktrace.h"
+
+#include "ardour/audioengine.h"
 #include "ardour/automation_control.h"
 #include "ardour/automation_watch.h"
+#include "ardour/control_group.h"
 #include "ardour/event_type_map.h"
 #include "ardour/session.h"
 
-#include "pbd/memento_command.h"
-#include "pbd/stacktrace.h"
-
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef COMPILER_MSVC
 #include <float.h>
@@ -52,10 +55,14 @@ AutomationControl::AutomationControl(ARDOUR::Session&                          s
 	, _session(session)
 	, _desc(desc)
 {
+	if (_desc.toggled) {
+		set_flags (Controllable::Toggle);
+	}
 }
 
 AutomationControl::~AutomationControl ()
 {
+	DropReferences (); /* EMIT SIGNAL */
 }
 
 bool
@@ -72,36 +79,73 @@ AutomationControl::writable() const
 double
 AutomationControl::get_value() const
 {
-	bool from_list = _list && ((AutomationList*)_list.get())->automation_playback();
+	bool from_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_playback();
 	return Control::get_double (from_list, _session.transport_frame());
 }
 
+void
+AutomationControl::set_value (double val, PBD::Controllable::GroupControlDisposition gcd)
+{
+	if (!writable()) {
+		return;
+	}
+
+	/* enforce strict double/boolean value mapping */
+
+	if (_desc.toggled) {
+		if (val != 0.0) {
+			val = 1.0;
+		}
+	}
+
+	if (check_rt (val, gcd)) {
+		/* change has been queued to take place in an RT context */
+		return;
+	}
+
+	if (_group && _group->use_me (gcd)) {
+		_group->set_group_value (shared_from_this(), val);
+	} else {
+		actually_set_value (val, gcd);
+	}
+}
+
 /** 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 (double value, PBD::Controllable::GroupControlDisposition /* group_override */)
+AutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd)
 {
-	bool to_list = _list && ((AutomationList*)_list.get())->automation_write();
+	bool to_list = _list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_write();
+	//const double old_value = Control::user_double ();
 
 	Control::set_double (value, _session.transport_frame(), to_list);
 
-	Changed(); /* EMIT SIGNAL */
+	//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);
 }
 
 void
 AutomationControl::set_list (boost::shared_ptr<Evoral::ControlList> list)
 {
 	Control::set_list (list);
-	Changed();  /* EMIT SIGNAL */
+	Changed (true, Controllable::NoGroup);
 }
 
 void
 AutomationControl::set_automation_state (AutoState as)
 {
+	if (flags() & NotAutomatable) {
+		return;
+	}
 	if (_list && as != alist()->automation_state()) {
 
+		const double val = get_value ();
+
 		alist()->set_automation_state (as);
 		if (_desc.toggled) {
 			return;  // No watch for boolean automation
@@ -110,6 +154,11 @@ AutomationControl::set_automation_state (AutoState as)
 		if (as == Write) {
 			AutomationWatch::instance().add_automation_watch (shared_from_this());
 		} else if (as == Touch) {
+			if (alist()->empty()) {
+				Control::set_double (val, _session.current_start_frame (), true);
+				Control::set_double (val, _session.current_end_frame (), true);
+				Changed (true, Controllable::NoGroup);
+			}
 			if (!touching()) {
 				AutomationWatch::instance().remove_automation_watch (shared_from_this());
 			} else {
@@ -231,4 +280,26 @@ AutomationControl::interface_to_internal (double val) const
 	return val;
 }
 
+void
+AutomationControl::set_group (boost::shared_ptr<ControlGroup> cg)
+{
+	/* this method can only be called by a ControlGroup. We do not need
+	   to ensure consistency by calling ControlGroup::remove_control(),
+	   since we are guaranteed that the ControlGroup will take care of that
+	   for us.
+	*/
 
+	_group = cg;
+}
+
+bool
+AutomationControl::check_rt (double val, Controllable::GroupControlDisposition gcd)
+{
+	if (!_session.loading() && (flags() & Controllable::RealTime) && !AudioEngine::instance()->in_process_thread()) {
+		/* queue change in RT context */
+		_session.set_control (shared_from_this(), val, gcd);
+		return true;
+	}
+
+	return false;
+}