X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fslave.cc;h=47dd80f8b4b59ef06d60d61614cfb10c155bde48;hb=1be2790caca1130d1b5957c9540b7f5070635c47;hp=ce03f0b17ead819ac6f5a3961b89f91e835f1598;hpb=ede4ecbb00ecc866c502454c81e711baea780ccd;p=ardour.git

diff --git a/libs/ardour/slave.cc b/libs/ardour/slave.cc
index ce03f0b17e..47dd80f8b4 100644
--- a/libs/ardour/slave.cc
+++ b/libs/ardour/slave.cc
@@ -29,40 +29,53 @@ SlaveSessionProxy::tempo_map() const
 	return session.tempo_map();
 }
 
-nframes_t
-SlaveSessionProxy::frame_rate() const
+samplecnt_t
+SlaveSessionProxy::sample_rate() const
 {
-	return session.frame_rate();
+	return session.sample_rate();
 }
 
-framepos_t
-SlaveSessionProxy::audible_frame() const
+pframes_t
+SlaveSessionProxy::samples_per_cycle() const
 {
-	return session.audible_frame();
+	return session.engine().samples_per_cycle();
 }
 
-framepos_t
-SlaveSessionProxy::transport_frame() const
+samplepos_t
+SlaveSessionProxy::audible_sample() const
 {
-	return session.transport_frame();
+	return session.audible_sample();
 }
 
-nframes_t
-SlaveSessionProxy::frames_since_cycle_start() const
+samplepos_t
+SlaveSessionProxy::transport_sample() const
 {
-	return session.engine().frames_since_cycle_start();
+	return session.transport_sample();
 }
 
-framepos_t
-SlaveSessionProxy::frame_time() const
+pframes_t
+SlaveSessionProxy::samples_since_cycle_start() const
 {
-	return session.engine().frame_time();
+	return session.engine().samples_since_cycle_start();
+}
+
+samplepos_t
+SlaveSessionProxy::sample_time_at_cycle_start() const
+{
+	return session.engine().sample_time_at_cycle_start();
+}
+
+
+samplepos_t
+SlaveSessionProxy::sample_time() const
+{
+	return session.engine().sample_time();
 }
 
 void
-SlaveSessionProxy::request_locate(framepos_t frame, bool with_roll)
+SlaveSessionProxy::request_locate(samplepos_t sample, bool with_roll)
 {
-	session.request_locate(frame, with_roll);
+	session.request_locate(sample, with_roll);
 }
 
 void