X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomatable.cc;h=9670f68689355d838804025beb2daae8cff6204c;hb=85e12e809547ba05d1857f0620a4fba61da6d991;hp=9a37b1d590cd190304e16a89d20fa2fdc8ff7a51;hpb=517467f29747acde8baa6f42ed064e2ed58f5ea5;p=ardour.git

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 9a37b1d590..9670f68689 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -17,10 +17,10 @@
 
 */
 
-#include <fstream>
 #include <cstdio>
 #include <errno.h>
 
+#include "pbd/gstdio_compat.h"
 #include <glibmm/miscutils.h>
 
 #include "pbd/error.h"
@@ -66,7 +66,7 @@ Automatable::~Automatable ()
 {
 	{
 		Glib::Threads::Mutex::Lock lm (_control_lock);
-		
+
 		for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
 			boost::dynamic_pointer_cast<AutomationControl>(li->second)->drop_references ();
 		}
@@ -98,7 +98,8 @@ Automatable::load_automation (const string& path)
 		fullpath = _a_session.automation_dir();
 		fullpath += path;
 	}
-	ifstream in (fullpath.c_str());
+
+	FILE * in = g_fopen (fullpath.c_str (), "rb");
 
 	if (!in) {
 		warning << string_compose(_("cannot open %2 to load automation data (%3)")
@@ -110,14 +111,17 @@ Automatable::load_automation (const string& path)
 	set<Evoral::Parameter> tosave;
 	controls().clear ();
 
-	while (in) {
+	while (!feof(in)) {
 		double when;
 		double value;
 		uint32_t port;
 
-		in >> port;  if (!in) break;
-		in >> when;  if (!in) goto bad;
-		in >> value; if (!in) goto bad;
+		if (3 != fscanf (in, "%d %lf %lf", &port, &when, &value)) {
+			if (feof(in)) {
+				break;
+			}
+			goto bad;
+		}
 
 		Evoral::Parameter param(PluginAutomation, 0, port);
 		/* FIXME: this is legacy and only used for plugin inserts?  I think? */
@@ -125,12 +129,14 @@ Automatable::load_automation (const string& path)
 		c->list()->add (when, value);
 		tosave.insert (param);
 	}
+	::fclose (in);
 
 	return 0;
 
   bad:
 	error << string_compose(_("cannot load automation data from %2"), fullpath) << endmsg;
 	controls().clear ();
+	::fclose (in);
 	return -1;
 }
 
@@ -278,6 +284,7 @@ Automatable::set_parameter_automation_state (Evoral::Parameter param, AutoState
 	if (c && (s != c->automation_state())) {
 		c->set_automation_state (s);
 		_a_session.set_dirty ();
+		AutomationStateChanged(); /* Emit signal */
 	}
 }
 
@@ -287,7 +294,7 @@ Automatable::get_parameter_automation_state (Evoral::Parameter param)
 	AutoState result = Off;
 
 	boost::shared_ptr<AutomationControl> c = automation_control(param);
-	
+
 	if (c) {
 		result = c->automation_state();
 	}
@@ -387,16 +394,21 @@ Automatable::transport_stopped (framepos_t now)
 		   when the transport is re-started, a touch will magically
 		   be happening without it ever have being started in the usual way.
 		*/
+		const bool list_did_write = !l->in_new_write_pass ();
+
 		l->stop_touch (true, now);
-		l->write_pass_finished (now, Config->get_automation_thinning_factor());
 
-		if (l->automation_playback()) {
-			c->set_value(c->list()->eval(now));
-		}
+		c->commit_transaction (list_did_write);
+
+		l->write_pass_finished (now, Config->get_automation_thinning_factor ());
 
-		if (l->automation_state() == Write) {
+		if (l->automation_state () == Write) {
 			l->set_automation_state (Touch);
 		}
+
+		if (l->automation_playback ()) {
+			c->set_value_unchecked (c->list ()->eval (now));
+		}
 	}
 }
 
@@ -494,3 +506,42 @@ Automatable::value_as_string (boost::shared_ptr<AutomationControl> ac) const
 {
 	return ARDOUR::value_as_string(ac->desc(), ac->get_value());
 }
+
+bool
+Automatable::find_next_event (double now, double end, Evoral::ControlEvent& next_event, bool only_active) const
+{
+	Controls::const_iterator li;
+
+	next_event.when = std::numeric_limits<double>::max();
+
+	for (li = _controls.begin(); li != _controls.end(); ++li) {
+		boost::shared_ptr<AutomationControl> c
+			= boost::dynamic_pointer_cast<AutomationControl>(li->second);
+
+		if (only_active && (!c || !c->automation_playback())) {
+			continue;
+		}
+
+		Evoral::ControlList::const_iterator i;
+		boost::shared_ptr<const Evoral::ControlList> alist (li->second->list());
+		Evoral::ControlEvent cp (now, 0.0f);
+		if (!alist) {
+			continue;
+		}
+
+		for (i = lower_bound (alist->begin(), alist->end(), &cp, Evoral::ControlList::time_comparator);
+		     i != alist->end() && (*i)->when < end; ++i) {
+			if ((*i)->when > now) {
+				break;
+			}
+		}
+
+		if (i != alist->end() && (*i)->when < end) {
+			if ((*i)->when < next_event.when) {
+				next_event.when = (*i)->when;
+			}
+		}
+	}
+
+	return next_event.when != std::numeric_limits<double>::max();
+}