X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fevoral%2Fsrc%2FControlSet.cpp;h=d4480c2897859d048eb3d014ef68c16ba0ffe038;hb=f97da74cf7d3c2d3ae580473fa4639b0b259bf5b;hp=0ccefdc284d13e4e83691a9df37c1cc799ab59be;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp
index 0ccefdc284..d4480c2897 100644
--- a/libs/evoral/src/ControlSet.cpp
+++ b/libs/evoral/src/ControlSet.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David Robillard <http://drobilla.net>
  * Copyright (C) 2000-2008 Paul Davis
  *
  * Evoral is free software; you can redistribute it and/or modify it under the
@@ -16,6 +16,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <iostream>
 #include <limits>
 #include "evoral/ControlSet.hpp"
 #include "evoral/ControlList.hpp"
@@ -31,18 +32,33 @@ ControlSet::ControlSet()
 {
 }
 
+ControlSet::ControlSet (const ControlSet&)
+	: noncopyable ()
+{
+	/* derived class must copy controls */
+}
+
 void
 ControlSet::add_control(boost::shared_ptr<Control> ac)
 {
 	_controls[ac->parameter()] = ac;
+
+	ac->ListMarkedDirty.connect_same_thread (_control_connections, boost::bind (&ControlSet::control_list_marked_dirty, this));
+
+	ac->list()->InterpolationChanged.connect_same_thread (
+		_list_connections, boost::bind (&ControlSet::control_list_interpolation_changed, this, ac->parameter(), _1)
+	                                                      );
 }
 
 void
 ControlSet::what_has_data (set<Parameter>& s) const
 {
 	Glib::Mutex::Lock lm (_control_lock);
+
 	for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
-		s.insert(li->first);
+		if (li->second->list() && !li->second->list()->empty()) {
+			s.insert (li->first);
+		}
 	}
 }
 
@@ -64,38 +80,37 @@ ControlSet::control (const Parameter& parameter, bool create_if_missing)
 		return ac;
 
 	} else {
-		//warning << "ControlList " << parameter.to_string() << " not found for " << _name << endmsg;
 		return boost::shared_ptr<Control>();
 	}
 }
 
 bool
-ControlSet::find_next_event (FrameTime now, FrameTime end, ControlEvent& next_event) const
+ControlSet::find_next_event (double now, double end, ControlEvent& next_event) const
 {
 	Controls::const_iterator li;
 
-	next_event.when = std::numeric_limits<FrameTime>::max();
+	next_event.when = std::numeric_limits<double>::max();
 
-  	for (li = _controls.begin(); li != _controls.end(); ++li) {
+	for (li = _controls.begin(); li != _controls.end(); ++li) {
 		ControlList::const_iterator i;
 		boost::shared_ptr<const ControlList> alist (li->second->list());
 		ControlEvent cp (now, 0.0f);
 
- 		for (i = lower_bound (alist->begin(), alist->end(), &cp, 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<FrameTime>::max();
+		for (i = lower_bound (alist->begin(), alist->end(), &cp, 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();
 }
 
 void
@@ -103,9 +118,11 @@ ControlSet::clear_controls ()
 {
 	Glib::Mutex::Lock lm (_control_lock);
 
+	_control_connections.drop_connections ();
+	_list_connections.drop_connections ();
+
 	for (Controls::iterator li = _controls.begin(); li != _controls.end(); ++li)
 		li->second->list()->clear();
 }
 
-
 } // namespace Evoral