change Audio backend sample time methods to use a 64 bit timeline

6 files changed, 10 insertions, 10 deletions

diff --git a/libs/ardour/ardour/audio_backend.h b/libs/ardour/ardour/audio_backend.h
index 8070a1c3aa..e0e7d8e904 100644
--- a/libs/ardour/ardour/audio_backend.h
+++ b/libs/ardour/ardour/audio_backend.h
@@ -477,12 +477,12 @@ class LIBARDOUR_API AudioBackend : public PortEngine {
      *
      * Can be called from any thread.
      */
-    virtual pframes_t sample_time () = 0;
+    virtual framepos_t sample_time () = 0;
 
     /** Return the time according to the sample clock in use when the most
      * recent buffer process cycle began. Can be called from any thread.
      */
-    virtual pframes_t sample_time_at_cycle_start () = 0;
+    virtual framepos_t sample_time_at_cycle_start () = 0;
 
     /** Return the time since the current buffer process cycle started,
      * in samples, according to the sample clock in use.
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 6516325eac..32b53102f7 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -94,8 +94,8 @@ class LIBARDOUR_API AudioEngine : public SessionHandlePtr, public PortManager
 	pframes_t      samples_per_cycle () const;
 	int            usecs_per_cycle () const;
 	size_t         raw_buffer_size (DataType t);
-	pframes_t      sample_time ();
-	pframes_t      sample_time_at_cycle_start ();
+	framepos_t     sample_time ();
+	framepos_t     sample_time_at_cycle_start ();
 	pframes_t      samples_since_cycle_start ();
 	bool           get_sync_offset (pframes_t& offset) const;
 
diff --git a/libs/ardour/ardour/port_engine.h b/libs/ardour/ardour/port_engine.h
index 62996b7cdf..aaf72d812a 100644
--- a/libs/ardour/ardour/port_engine.h
+++ b/libs/ardour/ardour/port_engine.h
@@ -336,7 +336,7 @@ class LIBARDOUR_API PortEngine {
      *
      * XXX to be removed after some more design cleanup. 
      */
-    virtual pframes_t sample_time_at_cycle_start () = 0;
+    virtual framepos_t sample_time_at_cycle_start () = 0;
 
   protected:
     PortManager& manager;
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index e86296b355..8396a337d7 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -189,7 +189,7 @@ class LIBARDOUR_API ISlaveSessionProxy {
 	virtual framepos_t audible_frame ()             const   { return 0; }
 	virtual framepos_t transport_frame ()           const   { return 0; }
 	virtual pframes_t  frames_since_cycle_start ()  const   { return 0; }
-	virtual pframes_t  sample_time_at_cycle_start() const   { return 0; }
+	virtual framepos_t sample_time_at_cycle_start() const   { return 0; }
 	virtual framepos_t frame_time ()                const   { return 0; }
 
 	virtual void request_locate (framepos_t /*frame*/, bool with_roll = false) {
@@ -212,7 +212,7 @@ class LIBARDOUR_API SlaveSessionProxy : public ISlaveSessionProxy {
 	framepos_t audible_frame ()              const;
 	framepos_t transport_frame ()            const;
 	pframes_t  frames_since_cycle_start ()   const;
-	pframes_t  sample_time_at_cycle_start()  const;
+	framepos_t sample_time_at_cycle_start()  const;
 	framepos_t frame_time ()                 const;
 
 	void request_locate (framepos_t frame, bool with_roll = false);
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index d318ff74fb..71b0fabea0 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -979,7 +979,7 @@ AudioEngine::raw_buffer_size (DataType t)
 	return _backend->raw_buffer_size (t);
 }
 
-pframes_t
+framepos_t
 AudioEngine::sample_time ()
 {
 	if (!_backend) {
@@ -988,7 +988,7 @@ AudioEngine::sample_time ()
 	return _backend->sample_time ();
 }
 
-pframes_t
+framepos_t
 AudioEngine::sample_time_at_cycle_start ()
 {
 	if (!_backend) {
diff --git a/libs/ardour/slave.cc b/libs/ardour/slave.cc
index c0678ce252..4fbb75f623 100644
--- a/libs/ardour/slave.cc
+++ b/libs/ardour/slave.cc
@@ -59,7 +59,7 @@ SlaveSessionProxy::frames_since_cycle_start() const
 	return session.engine().samples_since_cycle_start();
 }
 
-pframes_t
+framepos_t
 SlaveSessionProxy::sample_time_at_cycle_start() const
 {
 	return session.engine().sample_time_at_cycle_start();