X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fcontrol_protocol%2Fcontrol_protocol%2Fbasic_ui.h;h=3bd5ea1c0a30b99ebfc5ca3f220df32fd299e559;hb=4b861e603972148a29638cade51cee27ebc997a2;hp=52ff549af3eca2352643a2e4d698cfb5cfc2691b;hpb=f500846fd46d6eab97e5e02fd795b9a938464773;p=ardour.git

diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 52ff549af3..3bd5ea1c0a 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -26,9 +26,11 @@
 
 #include "pbd/signals.h"
 
+#include "ardour/types.h"
+
 #include <jack/types.h>
 
-#include "control_protocol/timecode.h"
+#include "timecode/time.h"
 
 namespace ARDOUR {
 	class Session;
@@ -58,8 +60,8 @@ class BasicUI {
 	void set_transport_speed (double speed);
 	double get_transport_speed ();
 
-	jack_nframes_t transport_frame ();
-	void locate (jack_nframes_t frame, bool play = false);
+	ARDOUR::framepos_t transport_frame ();
+	void locate (ARDOUR::framepos_t frame, bool play = false);
 	bool locating ();
 	bool locked ();
 
@@ -77,11 +79,11 @@ class BasicUI {
 	void rec_enable_toggle ();
 	void toggle_all_rec_enables ();
 
-	jack_nframes_t timecode_frames_per_hour ();
+	ARDOUR::framecnt_t timecode_frames_per_hour ();
 
-	void timecode_time (jack_nframes_t where, Timecode::Time&);
-	void timecode_to_sample (Timecode::Time& timecode, int64_t& sample, bool use_subframes) const;
-	void sample_to_timecode (int64_t sample, Timecode::Time& timecode, bool use_subframes) const;
+	void timecode_time (framepos_t where, Timecode::Time&);
+	void timecode_to_sample (Timecode::Time& timecode, framepos_t & sample, bool use_offset, bool use_subframes) const;
+	void sample_to_timecode (framepos_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const;
 
   protected:
 	BasicUI ();