summaryrefslogtreecommitdiff
path: root/libs/backends/portaudio
diff options
context:
space:
mode:
Diffstat (limited to 'libs/backends/portaudio')
-rw-r--r--libs/backends/portaudio/audio_utils.h8
-rw-r--r--libs/backends/portaudio/cycle_timer.h2
-rw-r--r--libs/backends/portaudio/portaudio_backend.cc12
-rw-r--r--libs/backends/portaudio/portaudio_backend.h8
-rw-r--r--libs/backends/portaudio/portaudio_io.cc58
-rw-r--r--libs/backends/portaudio/portaudio_io.h6
6 files changed, 47 insertions, 47 deletions
diff --git a/libs/backends/portaudio/audio_utils.h b/libs/backends/portaudio/audio_utils.h
index 5e7d0a1a2a..8b7ab9d529 100644
--- a/libs/backends/portaudio/audio_utils.h
+++ b/libs/backends/portaudio/audio_utils.h
@@ -25,12 +25,12 @@ inline
void
deinterleave_audio_data(const float* interleaved_input,
float* output,
- uint32_t frame_count,
+ uint32_t sample_count,
uint32_t channel,
uint32_t channel_count)
{
const float* ptr = interleaved_input + channel;
- while (frame_count-- > 0) {
+ while (sample_count-- > 0) {
*output++ = *ptr;
ptr += channel_count;
}
@@ -40,12 +40,12 @@ inline
void
interleave_audio_data(float* input,
float* interleaved_output,
- uint32_t frame_count,
+ uint32_t sample_count,
uint32_t channel,
uint32_t channel_count)
{
float* ptr = interleaved_output + channel;
- while (frame_count-- > 0) {
+ while (sample_count-- > 0) {
*ptr = *input++;
ptr += channel_count;
}
diff --git a/libs/backends/portaudio/cycle_timer.h b/libs/backends/portaudio/cycle_timer.h
index 6fe665568c..b81a1ed234 100644
--- a/libs/backends/portaudio/cycle_timer.h
+++ b/libs/backends/portaudio/cycle_timer.h
@@ -25,7 +25,7 @@
// Could call it FrameTimer and make it more generic
// Could be an interface and or include clock source
-// include sample count/processed frames in iteration?
+// include sample count/processed samples in iteration?
class CycleTimer {
public:
CycleTimer ()
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;
diff --git a/libs/backends/portaudio/portaudio_backend.h b/libs/backends/portaudio/portaudio_backend.h
index 8a1624796b..336621f4ff 100644
--- a/libs/backends/portaudio/portaudio_backend.h
+++ b/libs/backends/portaudio/portaudio_backend.h
@@ -243,8 +243,8 @@ class PortAudioBackend : public AudioBackend {
size_t raw_buffer_size (DataType t);
/* Process time */
- framepos_t sample_time ();
- framepos_t sample_time_at_cycle_start ();
+ samplepos_t sample_time ();
+ samplepos_t sample_time_at_cycle_start ();
pframes_t samples_since_cycle_start ();
int create_process_thread (boost::function<void()> func);
@@ -342,7 +342,7 @@ class PortAudioBackend : public AudioBackend {
bool process_callback(const float* input,
float* output,
- uint32_t frame_count,
+ uint32_t sample_count,
const PaStreamCallbackTimeInfo* timeInfo,
PaStreamCallbackFlags statusFlags);
@@ -407,7 +407,7 @@ class PortAudioBackend : public AudioBackend {
/* processing */
float _dsp_load;
- framecnt_t _processed_samples;
+ samplecnt_t _processed_samples;
/* blocking thread */
pthread_t _main_blocking_thread;
diff --git a/libs/backends/portaudio/portaudio_io.cc b/libs/backends/portaudio/portaudio_io.cc
index 9ec8f6d6fb..140de6cf97 100644
--- a/libs/backends/portaudio/portaudio_io.cc
+++ b/libs/backends/portaudio/portaudio_io.cc
@@ -170,9 +170,9 @@ PortAudioIO::available_sample_rates(int device_id, std::vector<float>& sampleRat
#ifdef WITH_ASIO
bool
PortAudioIO::get_asio_buffer_properties (int device_id,
- long& min_size_frames,
- long& max_size_frames,
- long& preferred_size_frames,
+ long& min_size_samples,
+ long& max_size_samples,
+ long& preferred_size_samples,
long& granularity)
{
// we shouldn't really need all these checks but it shouldn't hurt
@@ -191,9 +191,9 @@ PortAudioIO::get_asio_buffer_properties (int device_id,
}
PaError err = PaAsio_GetAvailableBufferSizes (device_id,
- &min_size_frames,
- &max_size_frames,
- &preferred_size_frames,
+ &min_size_samples,
+ &max_size_samples,
+ &preferred_size_samples,
&granularity);
if (err != paNoError) {
@@ -216,15 +216,15 @@ PortAudioIO::get_asio_buffer_sizes(int device_id,
std::vector<uint32_t>& buffer_sizes,
bool preferred_only)
{
- long min_size_frames = 0;
- long max_size_frames = 0;
- long preferred_size_frames = 0;
+ long min_size_samples = 0;
+ long max_size_samples = 0;
+ long preferred_size_samples = 0;
long granularity = 0;
if (!get_asio_buffer_properties (device_id,
- min_size_frames,
- max_size_frames,
- preferred_size_frames,
+ min_size_samples,
+ max_size_samples,
+ preferred_size_samples,
granularity)) {
DEBUG_AUDIO (string_compose (
"Unable to get device buffer properties from device index %1\n", device_id));
@@ -232,58 +232,58 @@ PortAudioIO::get_asio_buffer_sizes(int device_id,
}
DEBUG_AUDIO (string_compose ("ASIO buffer properties for device %1, "
- "min_size_frames: %2, max_size_frames: %3, "
- "preferred_size_frames: %4, granularity: %5\n",
+ "min_size_samples: %2, max_size_samples: %3, "
+ "preferred_size_samples: %4, granularity: %5\n",
device_id,
- min_size_frames,
- max_size_frames,
- preferred_size_frames,
+ min_size_samples,
+ max_size_samples,
+ preferred_size_samples,
granularity));
- bool driver_returns_one_size = (min_size_frames == max_size_frames) &&
- (min_size_frames == preferred_size_frames);
+ bool driver_returns_one_size = (min_size_samples == max_size_samples) &&
+ (min_size_samples == preferred_size_samples);
if (preferred_only || driver_returns_one_size) {
- buffer_sizes.push_back(preferred_size_frames);
+ buffer_sizes.push_back(preferred_size_samples);
return true;
}
- long buffer_size = min_size_frames;
+ long buffer_size = min_size_samples;
// If min size and granularity are power of two then just use values that
// are power of 2 even if the granularity allows for more values
bool use_power_of_two =
- is_power_of_two(min_size_frames) && is_power_of_two(granularity);
+ is_power_of_two(min_size_samples) && is_power_of_two(granularity);
if (granularity <= 0 || use_power_of_two) {
// driver uses buffer sizes that are power of 2
- while (buffer_size <= max_size_frames) {
+ while (buffer_size <= max_size_samples) {
buffer_sizes.push_back(buffer_size);
buffer_size *= 2;
}
} else {
- if (min_size_frames == max_size_frames) {
+ if (min_size_samples == max_size_samples) {
// The devices I have tested either return the same values for
// min/max/preferred and changing buffer size is intended to only be
// done via the control dialog or they return a range where min != max
// but I guess min == max could happen if a driver only supports a single
// buffer size
- buffer_sizes.push_back(min_size_frames);
+ buffer_sizes.push_back(min_size_samples);
return true;
}
- // If min_size_frames is not power of 2 use at most 8 of the possible
+ // If min_size_samples is not power of 2 use at most 8 of the possible
// buffer sizes spread evenly between min and max
long max_values = 8;
- while (((max_size_frames - min_size_frames) / granularity) > max_values) {
+ while (((max_size_samples - min_size_samples) / granularity) > max_values) {
granularity *= 2;
}
- while (buffer_size < max_size_frames) {
+ while (buffer_size < max_size_samples) {
buffer_sizes.push_back(buffer_size);
buffer_size += granularity;
}
- buffer_sizes.push_back(max_size_frames);
+ buffer_sizes.push_back(max_size_samples);
}
return true;
}
diff --git a/libs/backends/portaudio/portaudio_io.h b/libs/backends/portaudio/portaudio_io.h
index c67fdc1b19..34eef43186 100644
--- a/libs/backends/portaudio/portaudio_io.h
+++ b/libs/backends/portaudio/portaudio_io.h
@@ -58,9 +58,9 @@ public:
#ifdef WITH_ASIO
bool get_asio_buffer_properties (int device_id,
- long& min_size_frames,
- long& max_size_frames,
- long& preferred_size_frames,
+ long& min_size_samples,
+ long& max_size_samples,
+ long& preferred_size_samples,
long& granularity);
bool get_asio_buffer_sizes(int device_id,
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-21 07:16:49 +0000