use class-static method rather than pretend there is a per-member value for Port...

[ardour.git] / libs / evoral / evoral / ControlSet.hpp

diff --git a/libs/evoral/evoral/ControlSet.hpp b/libs/evoral/evoral/ControlSet.hpp
index 1b5edb92ace1ec76f18d2fca631f33c2bc889a8f..5a9fc588b2591f1aa31f4be7242397e02d65c346 100644 (file)
--- a/libs/evoral/evoral/ControlSet.hpp
+++ b/libs/evoral/evoral/ControlSet.hpp
@@ -1,16 +1,16 @@
 /* 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
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- * 
+ *
  * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -23,24 +23,27 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
-#include <glibmm/thread.h>
-#include <evoral/types.hpp>
-#include <evoral/Parameter.hpp>
+#include <glibmm/threads.h>
+#include "pbd/signals.h"
+
+#include "evoral/visibility.h"
+#include "evoral/Parameter.hpp"
+#include "evoral/ControlList.hpp"
 
 namespace Evoral {
 
 class Control;
-class ControlList;
 class ControlEvent;
 
-class ControlSet : public boost::noncopyable {
+class LIBEVORAL_API ControlSet : public boost::noncopyable {
 public:
        ControlSet();
-       virtual ~ControlSet() {}
-       
+       ControlSet (const ControlSet&);
+        virtual ~ControlSet() {}
+
        virtual boost::shared_ptr<Evoral::Control>
        control_factory(const Evoral::Parameter& id) = 0;
-       
+
        boost::shared_ptr<Control>
        control (const Parameter& id, bool create_if_missing=false);
 
@@ -56,18 +59,27 @@ public:
 
        virtual void add_control(boost::shared_ptr<Control>);
 
-       bool find_next_event(nframes_t start, nframes_t end, ControlEvent& ev) const;
-       
-       virtual bool empty() const { return _controls.size() == 0; }
-       virtual void clear();
+       virtual bool find_next_event(double start, double end, ControlEvent& ev, bool only_active = true) const = 0;
+
+       virtual bool controls_empty() const { return _controls.size() == 0; }
+       virtual void clear_controls();
 
        void what_has_data(std::set<Parameter>&) const;
-       
-       Glib::Mutex& control_lock() const { return _control_lock; }
+
+        Glib::Threads::Mutex& control_lock() const { return _control_lock; }
 
 protected:
-       mutable Glib::Mutex _control_lock;
+       virtual void control_list_marked_dirty () {}
+       virtual void control_list_interpolation_changed (Parameter, ControlList::InterpolationStyle) {}
+
+       mutable Glib::Threads::Mutex _control_lock;
        Controls            _controls;
+
+       PBD::ScopedConnectionList _list_connections;
+
+private:
+
+       PBD::ScopedConnectionList _control_connections;
 };