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

14 files changed, 30 insertions, 30 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();
diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc
index ade04b5c30..812d9813bc 100644
--- a/libs/backends/alsa/alsa_audiobackend.cc
+++ b/libs/backends/alsa/alsa_audiobackend.cc
@@ -681,13 +681,13 @@ AlsaAudioBackend::raw_buffer_size (DataType t)
 }
 
 /* Process time */
-pframes_t
+framepos_t
 AlsaAudioBackend::sample_time ()
 {
 	return _processed_samples;
 }
 
-pframes_t
+framepos_t
 AlsaAudioBackend::sample_time_at_cycle_start ()
 {
 	return _processed_samples;
diff --git a/libs/backends/alsa/alsa_audiobackend.h b/libs/backends/alsa/alsa_audiobackend.h
index 7b3839ee73..3823db22ed 100644
--- a/libs/backends/alsa/alsa_audiobackend.h
+++ b/libs/backends/alsa/alsa_audiobackend.h
@@ -223,8 +223,8 @@ class AlsaAudioBackend : public AudioBackend {
 		size_t raw_buffer_size (DataType t);
 
 		/* Process time */
-		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 ();
 
 		int create_process_thread (boost::function<void()> func);
@@ -349,7 +349,7 @@ class AlsaAudioBackend : public AudioBackend {
 
 		/* processing */
 		float  _dsp_load;
-		uint64_t _processed_samples;
+		framecnt_t _processed_samples;
 		pthread_t _main_thread;
 
 		/* process threads */
diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc
index 2aa2f485b8..3822bc9802 100644
--- a/libs/backends/dummy/dummy_audiobackend.cc
+++ b/libs/backends/dummy/dummy_audiobackend.cc
@@ -470,13 +470,13 @@ DummyAudioBackend::raw_buffer_size (DataType t)
 }
 
 /* Process time */
-pframes_t
+framepos_t
 DummyAudioBackend::sample_time ()
 {
 	return _processed_samples;
 }
 
-pframes_t
+framepos_t
 DummyAudioBackend::sample_time_at_cycle_start ()
 {
 	return _processed_samples;
diff --git a/libs/backends/dummy/dummy_audiobackend.h b/libs/backends/dummy/dummy_audiobackend.h
index 4f8aa89f60..feff97d050 100644
--- a/libs/backends/dummy/dummy_audiobackend.h
+++ b/libs/backends/dummy/dummy_audiobackend.h
@@ -290,8 +290,8 @@ class DummyAudioBackend : public AudioBackend {
 		size_t raw_buffer_size (DataType t);
 
 		/* Process time */
-		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 ();
 
 		int create_process_thread (boost::function<void()> func);
@@ -397,7 +397,7 @@ class DummyAudioBackend : public AudioBackend {
 		uint32_t _systemic_input_latency;
 		uint32_t _systemic_output_latency;
 
-		uint64_t _processed_samples;
+		framecnt_t _processed_samples;
 
 		pthread_t _main_thread;
 
diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
index c93b7c37e0..dea2d2e9a3 100644
--- a/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -660,14 +660,14 @@ JACKAudioBackend::get_sync_offset (pframes_t& offset) const
 	return false;
 }
 
-pframes_t
+framepos_t
 JACKAudioBackend::sample_time ()
 {
 	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
 	return jack_frame_time (_priv_jack);
 }
 
-pframes_t
+framepos_t
 JACKAudioBackend::sample_time_at_cycle_start ()
 {
 	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h
index 3a1225f90d..db00842e4a 100644
--- a/libs/backends/jack/jack_audiobackend.h
+++ b/libs/backends/jack/jack_audiobackend.h
@@ -97,8 +97,8 @@ class JACKAudioBackend : public AudioBackend {
 
     float dsp_load() const;
 
-    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 ();
 
     size_t raw_buffer_size (DataType t);
diff --git a/libs/backends/wavesaudio/waves_audiobackend.cc b/libs/backends/wavesaudio/waves_audiobackend.cc
index a8908a4f99..0b42b3bce7 100644
--- a/libs/backends/wavesaudio/waves_audiobackend.cc
+++ b/libs/backends/wavesaudio/waves_audiobackend.cc
@@ -731,7 +731,7 @@ void
 WavesAudioBackend::_audio_device_callback (const float* input_buffer, 
                                            float* output_buffer, 
                                            unsigned long nframes,
-                                           pframes_t sample_time,
+                                           framepos_t sample_time,
                                            uint64_t cycle_start_time_nanos)
 {
     uint64_t dsp_start_time_nanos = __get_time_nanos();
@@ -988,7 +988,7 @@ WavesAudioBackend::raw_buffer_size (DataType data_type)
 }
 
 
-pframes_t
+framepos_t
 WavesAudioBackend::sample_time ()
 {
     // WARNING: This is approximate calculation. Implementation of accurate calculation is pending.
@@ -1015,7 +1015,7 @@ WavesAudioBackend::__get_time_nanos ()
 }
 
 
-pframes_t
+framepos_t
 WavesAudioBackend::sample_time_at_cycle_start ()
 {
     // COMMENTED FREQUENT DBG LOGS */ std::cout << "WavesAudioBackend::sample_time_at_cycle_start (): " << _sample_time_at_cycle_start << std::endl;
diff --git a/libs/backends/wavesaudio/waves_audiobackend.h b/libs/backends/wavesaudio/waves_audiobackend.h
index 20773441a7..f7e562c715 100644
--- a/libs/backends/wavesaudio/waves_audiobackend.h
+++ b/libs/backends/wavesaudio/waves_audiobackend.h
@@ -197,9 +197,9 @@ class WavesMidiPort;
 
     virtual size_t raw_buffer_size (DataType data_type);
     
-    virtual pframes_t sample_time ();
+    virtual framepos_t sample_time ();
 
-    virtual pframes_t sample_time_at_cycle_start ();
+    virtual framepos_t sample_time_at_cycle_start ();
 
     virtual pframes_t samples_since_cycle_start ();
 
@@ -347,7 +347,7 @@ class WavesMidiPort;
     void _audio_device_callback (const float* input_audio_buffer, 
                                  float* output_buffer, 
                                  unsigned long nframes,
-                                 pframes_t sample_time,
+                                 framepos_t sample_time,
                                  uint64_t cycle_start_time_nanos);
 
     void _changed_midi_devices ();