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

8 files changed, 20 insertions, 20 deletions

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 ();