use newly-public libsmf functions for variable length quantities to load+store MIDI...

[ardour.git] / libs / evoral / src / ControlSet.cpp

diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp
index 0ccefdc284d13e4e83691a9df37c1cc799ab59be..c042b21ec25d225f07633ffcf2fca058398d3dbb 100644 (file)
--- a/libs/evoral/src/ControlSet.cpp
+++ b/libs/evoral/src/ControlSet.cpp
@@ -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,10 +32,22 @@ ControlSet::ControlSet()
 {
 }
 
+ControlSet::ControlSet (const ControlSet& other)
+        : 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
@@ -64,17 +77,16 @@ 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) {
                ControlList::const_iterator i;
@@ -95,7 +107,7 @@ ControlSet::find_next_event (FrameTime now, FrameTime end, ControlEvent& next_ev
                }
        }
 
-       return next_event.when != std::numeric_limits<FrameTime>::max();
+       return next_event.when != std::numeric_limits<double>::max();
 }
 
 void
@@ -103,9 +115,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