X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fbackends%2Fportaudio%2Fportaudio_backend.cc;h=be43e67a6217e2a7f780c8e1643f0adca5a33824;hp=46e508fba71f497e450e3f39820d07861f7c2fdd;hb=30b087ab3d28f1585987fa3f6ae006562ae192e3;hpb=cb956e3e480716a3efd280a5287bdd7bee1cedc5

diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc
index 46e508fba7..be43e67a62 100644
--- a/libs/backends/portaudio/portaudio_backend.cc
+++ b/libs/backends/portaudio/portaudio_backend.cc
@@ -716,7 +716,7 @@ PortAudioBackend::_start (bool for_latency_measurement)
 int
 PortAudioBackend::portaudio_callback(const void* input,
                                      void* output,
-                                     unsigned long frame_count,
+                                     unsigned long sample_count,
                                      const PaStreamCallbackTimeInfo* time_info,
                                      PaStreamCallbackFlags status_flags,
                                      void* user_data)
@@ -725,7 +725,7 @@ PortAudioBackend::portaudio_callback(const void* input,
 
 	if (!pa_backend->process_callback((const float*)input,
 	                                  (float*)output,
-	                                  frame_count,
+	                                  sample_count,
 	                                  time_info,
 	                                  status_flags)) {
 		return paAbort;
@@ -737,7 +737,7 @@ PortAudioBackend::portaudio_callback(const void* input,
 bool
 PortAudioBackend::process_callback(const float* input,
                                    float* output,
-                                   uint32_t frame_count,
+                                   uint32_t sample_count,
                                    const PaStreamCallbackTimeInfo* timeInfo,
                                    PaStreamCallbackFlags statusFlags)
 {
@@ -767,7 +767,7 @@ PortAudioBackend::process_callback(const float* input,
 	}
 
 	if (!_run || _freewheel) {
-		memset(output, 0, frame_count * sizeof(float) * _system_outputs.size());
+		memset(output, 0, sample_count * sizeof(float) * _system_outputs.size());
 		return true;
 	}
 
@@ -1004,13 +1004,13 @@ PortAudioBackend::raw_buffer_size (DataType t)
 }
 
 /* Process time */
-framepos_t
+samplepos_t
 PortAudioBackend::sample_time ()
 {
 	return _processed_samples;
 }
 
-framepos_t
+samplepos_t
 PortAudioBackend::sample_time_at_cycle_start ()
 {
 	return _processed_samples;