A few type fixes.

git-svn-id: svn://localhost/ardour2/branches/3.0@8154 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 15 insertions, 14 deletions

diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index 3d00b6283f..9d55b3ac53 100644
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -28,7 +28,6 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
-using ARDOUR::nframes_t;
 
 PBD::Signal2<void,std::string,std::string> BasicUI::AccessAction;
 
@@ -94,7 +93,7 @@ BasicUI::goto_end ()
 void       
 BasicUI::add_marker ()
 {
-	nframes_t when = session->audible_frame();
+	framepos_t when = session->audible_frame();
 	session->locations()->add (new Location (*session, when, when, _("unnamed"), Location::IsMark));
 }
 
@@ -248,14 +247,14 @@ BasicUI::set_record_enable (bool yn)
 	}
 }
 
-nframes_t
+framepos_t
 BasicUI::transport_frame ()
 {
 	return session->transport_frame();
 }
 
 void
-BasicUI::locate (nframes_t where, bool roll_after_locate)
+BasicUI::locate (framepos_t where, bool roll_after_locate)
 {
 	session->request_locate (where, roll_after_locate);
 }
@@ -272,26 +271,26 @@ BasicUI::locked ()
 	return session->transport_locked ();
 }
 
-nframes_t
+ARDOUR::framecnt_t
 BasicUI::timecode_frames_per_hour ()
 {
 	return session->timecode_frames_per_hour ();
 }
 
 void
-BasicUI::timecode_time (nframes_t where, Timecode::Time& timecode)
+BasicUI::timecode_time (framepos_t where, Timecode::Time& timecode)
 {
 	session->timecode_time (where, *((Timecode::Time *) &timecode));
 }
 
 void 
-BasicUI::timecode_to_sample (Timecode::Time& timecode, int64_t& sample, bool use_offset, bool use_subframes) const
+BasicUI::timecode_to_sample (Timecode::Time& timecode, framepos_t & sample, bool use_offset, bool use_subframes) const
 {
 	session->timecode_to_sample (*((Timecode::Time*)&timecode), sample, use_offset, use_subframes);
 }
 
 void 
-BasicUI::sample_to_timecode (int64_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const
+BasicUI::sample_to_timecode (framepos_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const
 {
 	session->sample_to_timecode (sample, *((Timecode::Time*)&timecode), use_offset, use_subframes);
 }
diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 7e25ea8a90..4f53ed43ae 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -26,6 +26,8 @@
 
 #include "pbd/signals.h"
 
+#include "ardour/types.h"
+
 #include <jack/types.h>
 
 #include "control_protocol/timecode.h"
@@ -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_offset, bool use_subframes) const;
-	void sample_to_timecode (int64_t sample, Timecode::Time& timecode, bool use_offset, 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 ();