X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fevoral%2Fevoral%2FControl.hpp;h=2f6e72be1e82fe3364cc1848602953fe9361ff09;hb=ead5dd45689be089d79a4a5daad88da737ca4cd9;hp=173356b60fa6bfed3b3b6a27297ad7edb5899e57;hpb=598c3cc958a9ff90db68799adc2638b053219eef;p=ardour.git

diff --git a/libs/evoral/evoral/Control.hpp b/libs/evoral/evoral/Control.hpp
index 173356b60f..2f6e72be1e 100644
--- 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 {
 
@@ -37,8 +36,8 @@ public:
 	Control(const Parameter& parameter, boost::shared_ptr<ControlList>);
 	virtual ~Control() {}
 
-	virtual void  set_float(float val, bool to_list=false, nframes_t frame=0);
-	virtual float get_float(bool from_list=false, nframes_t frame=0) 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>);