5 files changed, 12 insertions, 12 deletions
diff --git a/libs/surfaces/tranzport/button_events.cc b/libs/surfaces/tranzport/button_events.cc
index ebc00f95be..bac2a218e5 100644
--- a/libs/surfaces/tranzport/button_events.cc
+++ b/libs/surfaces/tranzport/button_events.cc
@@ -243,7 +243,7 @@ TranzportControlProtocol::button_event_prev_release (bool shifted)
 }
 
 // Note - add_marker should adhere to the snap to setting
-// maybe session->audible_frame does that
+// maybe session->audible_sample does that
 
 void
 TranzportControlProtocol::button_event_add_press (bool shifted)
diff --git a/libs/surfaces/tranzport/general.cc b/libs/surfaces/tranzport/general.cc
index 2b39aaa2d7..f92d6997be 100644
--- a/libs/surfaces/tranzport/general.cc
+++ b/libs/surfaces/tranzport/general.cc
@@ -181,7 +181,7 @@ TranzportControlProtocol::update_state ()
 void
 TranzportControlProtocol::prev_marker ()
 {
-	Location *location = session->locations()->first_location_before (session->transport_frame());
+	Location *location = session->locations()->first_location_before (session->transport_sample());
 
 	if (location) {
 		session->request_locate (location->start(), session->transport_rolling());
@@ -196,13 +196,13 @@ TranzportControlProtocol::prev_marker ()
 void
 TranzportControlProtocol::next_marker ()
 {
-	Location *location = session->locations()->first_location_after (session->transport_frame());
+	Location *location = session->locations()->first_location_after (session->transport_sample());
 
 	if (location) {
 		session->request_locate (location->start(), session->transport_rolling());
 		notify(location->name().c_str());
 	} else {
-		session->request_locate (session->current_end_frame());
+		session->request_locate (session->current_end_sample());
 		notify("END ");
 	}
 }
diff --git a/libs/surfaces/tranzport/init.cc b/libs/surfaces/tranzport/init.cc
index 96ff493c0e..56501b2c2c 100644
--- a/libs/surfaces/tranzport/init.cc
+++ b/libs/surfaces/tranzport/init.cc
@@ -123,7 +123,7 @@ TranzportControlProtocol::TranzportControlProtocol (Session& s)
 	_device_status = STATUS_OFFLINE;
 	udev = 0;
 	current_track_id = 0;
-	last_where = max_frames;
+	last_where = max_samples;
 	wheel_mode = WheelTimeline;
 	wheel_shift_mode = WheelShiftGain;
 	wheel_increment = WheelIncrScreen;
diff --git a/libs/surfaces/tranzport/show.cc b/libs/surfaces/tranzport/show.cc
index 027665ef4a..027485b944 100644
--- a/libs/surfaces/tranzport/show.cc
+++ b/libs/surfaces/tranzport/show.cc
@@ -284,7 +284,7 @@ TranzportControlProtocol::show_meter ()
 }
 
 void
-TranzportControlProtocol::show_bbt (framepos_t where)
+TranzportControlProtocol::show_bbt (samplepos_t where)
 {
 	if (where != last_where) {
 		char buf[16];
@@ -348,11 +348,11 @@ TranzportControlProtocol::show_bbt (framepos_t where)
 void
 TranzportControlProtocol::show_transport_time ()
 {
-	show_bbt (session->transport_frame ());
+	show_bbt (session->transport_sample ());
 }
 
 void
-TranzportControlProtocol::show_timecode (framepos_t where)
+TranzportControlProtocol::show_timecode (samplepos_t where)
 {
 	if ((where != last_where) || lcd_isdamaged(1,9,10)) {
 
diff --git a/libs/surfaces/tranzport/tranzport_control_protocol.h b/libs/surfaces/tranzport/tranzport_control_protocol.h
index 32d88aaf5e..95def2bc6e 100644
--- a/libs/surfaces/tranzport/tranzport_control_protocol.h
+++ b/libs/surfaces/tranzport/tranzport_control_protocol.h
@@ -192,8 +192,8 @@ private:
 	uint32_t       last_hrs;
 	uint32_t       last_mins;
 	uint32_t       last_secs;
-	uint32_t       last_frames;
-	framepos_t     last_where;
+	uint32_t       last_samples;
+	samplepos_t     last_where;
 	ARDOUR::gain_t last_track_gain;
 	uint32_t       last_meter_fill;
 	struct timeval last_wheel_motion;
@@ -301,8 +301,8 @@ private:
 	void show_current_track ();
 	void show_track_gain ();
 	void show_transport_time ();
-	void show_bbt (framepos_t where);
-	void show_timecode (framepos_t where);
+	void show_bbt (samplepos_t where);
+	void show_timecode (samplepos_t where);
 	void show_wheel_mode ();
 	void show_gain ();
 	void show_pan ();