fixes for 98% of all the warnings/errors reported by OS X gcc on tiger

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

diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp
index d985e347d74c86873fc6bfc27e037ae13367b24d..bdc73121d246cbcb568f11c67d6bc351b9ef7597 100644 (file)
--- 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,7 +32,7 @@ ControlSet::ControlSet()
 {
 }
 
-ControlSet::ControlSet (const ControlSet& other)
+ControlSet::ControlSet (const ControlSet&)
         : noncopyable ()
 {
         /* derived class must copy controls */
@@ -43,14 +44,21 @@ 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);
+               }
        }
 }
 
@@ -77,11 +85,11 @@ ControlSet::control (const Parameter& parameter, bool create_if_missing)
 }
 
 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;
@@ -102,7 +110,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
@@ -111,10 +119,10 @@ 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