4 files changed, 18 insertions, 18 deletions

diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
index 8b9e4af1dd..616964c3f2 100644
--- a/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -633,14 +633,14 @@ JACKAudioBackend::transport_start ()
 }
 
 void
-JACKAudioBackend::transport_locate (framepos_t where)
+JACKAudioBackend::transport_locate (samplepos_t where)
 {
 	GET_PRIVATE_JACK_POINTER (_priv_jack);
 	jack_transport_locate (_priv_jack, where);
 }
 
-framepos_t
-JACKAudioBackend::transport_frame () const
+samplepos_t
+JACKAudioBackend::transport_sample () const
 {
 	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
 	return jack_get_current_transport_frame (_priv_jack);
@@ -693,14 +693,14 @@ JACKAudioBackend::get_sync_offset (pframes_t& offset) const
 	return false;
 }
 
-framepos_t
+samplepos_t
 JACKAudioBackend::sample_time ()
 {
 	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
 	return jack_frame_time (_priv_jack);
 }
 
-framepos_t
+samplepos_t
 JACKAudioBackend::sample_time_at_cycle_start ()
 {
 	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
@@ -1164,7 +1164,7 @@ JACKAudioBackend::set_midi_option (const string& opt)
 }
 
 bool
-JACKAudioBackend::speed_and_position (double& speed, framepos_t& position)
+JACKAudioBackend::speed_and_position (double& speed, samplepos_t& position)
 {
 	jack_position_t pos;
 	jack_transport_state_t state;
diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h
index 2c67dc72fd..eb66f7ca3f 100644
--- a/libs/backends/jack/jack_audiobackend.h
+++ b/libs/backends/jack/jack_audiobackend.h
@@ -100,8 +100,8 @@ class JACKAudioBackend : public AudioBackend {
 
     float dsp_load() const;
 
-    framepos_t sample_time ();
-    framepos_t sample_time_at_cycle_start ();
+    samplepos_t sample_time ();
+    samplepos_t sample_time_at_cycle_start ();
     pframes_t samples_since_cycle_start ();
 
     size_t raw_buffer_size (DataType t);
@@ -113,9 +113,9 @@ class JACKAudioBackend : public AudioBackend {
 
     void transport_start ();
     void transport_stop ();
-    void transport_locate (framepos_t /*pos*/);
+    void transport_locate (samplepos_t /*pos*/);
     TransportState transport_state () const;
-    framepos_t transport_frame() const;
+    samplepos_t transport_sample() const;
 
     int set_time_master (bool /*yn*/);
     bool get_sync_offset (pframes_t& /*offset*/) const;
@@ -207,7 +207,7 @@ class JACKAudioBackend : public AudioBackend {
 
     /* transport sync */
 
-    bool speed_and_position (double& sp, framepos_t& pos);
+    bool speed_and_position (double& sp, samplepos_t& pos);
 
   private:
     boost::shared_ptr<JackConnection>  _jack_connection;
diff --git a/libs/backends/jack/jack_session.cc b/libs/backends/jack/jack_session.cc
index ce325321f3..b7d37a673f 100644
--- a/libs/backends/jack/jack_session.cc
+++ b/libs/backends/jack/jack_session.cc
@@ -114,14 +114,14 @@ JACKSession::timebase_callback (jack_transport_state_t /*state*/,
 {
 	Timecode::BBT_Time bbt;
 	TempoMap& tempo_map (_session->tempo_map());
-	framepos_t tf = _session->transport_frame ();
+	samplepos_t tf = _session->transport_sample ();
 
 	/* BBT info */
 
 	TempoMetric metric (tempo_map.metric_at (tf));
 
 	try {
-		bbt = tempo_map.bbt_at_frame (tf);
+		bbt = tempo_map.bbt_at_sample (tf);
 
 		pos->bar = bbt.bars;
 		pos->beat = bbt.beats;
@@ -142,7 +142,7 @@ JACKSession::timebase_callback (jack_transport_state_t /*state*/,
 
 #ifdef HAVE_JACK_VIDEO_SUPPORT
 	//poke audio video ratio so Ardour can track Video Sync
-	pos->audio_frames_per_video_frame = _session->frame_rate() / _session->timecode_frames_per_second();
+	pos->audio_samples_per_video_frame = _session->sample_rate() / _session->timecode_frames_per_second();
 	pos->valid = jack_position_bits_t (pos->valid | JackAudioVideoRatio);
 #endif
 
diff --git a/libs/backends/jack/weak_libjack.h b/libs/backends/jack/weak_libjack.h
index 88365dee7e..6af3e9c351 100644
--- a/libs/backends/jack/weak_libjack.h
+++ b/libs/backends/jack/weak_libjack.h
@@ -52,9 +52,9 @@ int have_libjack(void);
 #define jack_get_client_name                WJACK_get_client_name
 #define jack_get_sample_rate                WJACK_get_sample_rate
 #define jack_get_buffer_size                WJACK_get_buffer_size
-#define jack_frames_since_cycle_start       WJACK_frames_since_cycle_start
-#define jack_frame_time                     WJACK_frame_time
-#define jack_last_frame_time                WJACK_last_frame_time
+#define jack_frames_since_cycle_start       WJACK_samples_since_cycle_start
+#define jack_frame_time                     WJACK_sample_time
+#define jack_last_frame_time                WJACK_last_sample_time
 #define jack_get_time                       WJACK_get_time
 #define jack_cpu_load                       WJACK_cpu_load
 #define jack_is_realtime                    WJACK_is_realtime
@@ -115,7 +115,7 @@ int have_libjack(void);
 #define jack_set_thread_init_callback       WJACK_set_thread_init_callback
 
 /* <jack/transport.h> */
-#define jack_get_current_transport_frame    WJACK_get_current_transport_frame
+#define jack_get_current_transport_frame    WJACK_get_current_transport_sample
 #define jack_transport_locate               WJACK_transport_locate
 #define jack_transport_start                WJACK_transport_start
 #define jack_transport_stop                 WJACK_transport_stop