Remove unnecessary includes.

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

diff --git a/libs/evoral/evoral/ControlSet.hpp b/libs/evoral/evoral/ControlSet.hpp
index 95de58dead03f14a231001fa9af3052a4b85cef1..57a77afe7104e6392792b252dd2f532073af1054 100644 (file)
--- a/libs/evoral/evoral/ControlSet.hpp
+++ b/libs/evoral/evoral/ControlSet.hpp
@@ -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
@@ -23,8 +23,10 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include "pbd/signals.h"
+
+#include "evoral/visibility.h"
 #include "evoral/types.hpp"
 #include "evoral/Parameter.hpp"
 #include "evoral/ControlList.hpp"
@@ -34,11 +36,11 @@ namespace Evoral {
 class Control;
 class ControlEvent;
 
-class ControlSet : public boost::noncopyable {
+class LIBEVORAL_API ControlSet : public boost::noncopyable {
 public:
        ControlSet();
-        ControlSet (const ControlSet&);
-       virtual ~ControlSet() {}
+       ControlSet (const ControlSet&);
+        virtual ~ControlSet() {}
 
        virtual boost::shared_ptr<Evoral::Control>
        control_factory(const Evoral::Parameter& id) = 0;
@@ -58,26 +60,27 @@ public:
 
        virtual void add_control(boost::shared_ptr<Control>);
 
-       bool find_next_event(FrameTime start, FrameTime end, ControlEvent& ev) const;
+       bool find_next_event(double start, double end, ControlEvent& ev) const;
 
        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:
        virtual void control_list_marked_dirty () {}
        virtual void control_list_interpolation_changed (Parameter, ControlList::InterpolationStyle) {}
 
-       mutable Glib::Mutex _control_lock;
+       mutable Glib::Threads::Mutex _control_lock;
        Controls            _controls;
 
+       PBD::ScopedConnectionList _list_connections;
+       
 private:
 
        PBD::ScopedConnectionList _control_connections;
-       PBD::ScopedConnectionList _list_connections;
 };