* FIXME in midi_util.h

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

diff --git a/libs/evoral/evoral/Control.hpp b/libs/evoral/evoral/Control.hpp
index 15d50fcdcab430a3e3f03516fc6bdff38a1d2948..2f6e72be1e82fe3364cc1848602953fe9361ff09 100644 (file)
--- a/libs/evoral/evoral/Control.hpp
+++ b/libs/evoral/evoral/Control.hpp
@@ -22,9 +22,8 @@
 #include <set>
 #include <map>
 #include <boost/shared_ptr.hpp>
-#include <glibmm/thread.h>
-#include <evoral/types.hpp>
-#include <evoral/Parameter.hpp>
+#include "evoral/types.hpp"
+#include "evoral/Parameter.hpp"
 
 namespace Evoral {
 
@@ -34,21 +33,22 @@ class Transport;
 class Control
 {
 public:
-       Control(boost::shared_ptr<ControlList>);
+       Control(const Parameter& parameter, boost::shared_ptr<ControlList>);
        virtual ~Control() {}
 
-       void  set_value(float val, bool to_list=false, nframes_t frame=0);
-       float get_value(bool from_list=false, nframes_t frame=0) const;
-       float user_value() const;
+       virtual void  set_float(float val, bool to_list=false, FrameTime frame=0);
+       virtual float get_float(bool from_list=false, FrameTime frame=0) const;
+       virtual float user_float() const;
 
        void set_list(boost::shared_ptr<ControlList>);
 
        boost::shared_ptr<ControlList>       list()       { return _list; }
        boost::shared_ptr<const ControlList> list() const { return _list; }
 
-       const Parameter& parameter() const;
+       inline const Parameter& parameter() const { return _parameter; }
 
 protected:
+       Parameter                      _parameter;
        boost::shared_ptr<ControlList> _list;
        float                          _user_value;
 };