From 584ee51ca8d1b57805aa11e11709eee65c90afd9 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Wed, 2 Nov 2022 15:04:17 +0100 Subject: [PATCH] PulseAudio: set buffer attributes where they are used Just moving code. --- libs/backends/pulseaudio/pulseaudio_backend.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/backends/pulseaudio/pulseaudio_backend.cc b/libs/backends/pulseaudio/pulseaudio_backend.cc index 1921da4d68..5d99558e42 100644 --- a/libs/backends/pulseaudio/pulseaudio_backend.cc +++ b/libs/backends/pulseaudio/pulseaudio_backend.cc @@ -211,19 +211,10 @@ int PulseAudioBackend::init_pulse () { pa_sample_spec ss; - pa_buffer_attr ba; - ss.channels = N_CHANNELS; ss.rate = _samplerate; ss.format = PA_SAMPLE_FLOAT32LE; - /* https://freedesktop.org/software/pulseaudio/doxygen/structpa__buffer__attr.html */ - ba.minreq = _samples_per_period * N_CHANNELS * sizeof (float); - ba.maxlength = 2 * ba.minreq; - ba.prebuf = (uint32_t)-1; - ba.tlength = (uint32_t)-1; - ba.fragsize = 0; // capture only - if (!pa_sample_spec_valid (&ss)) { PBD::error << _("PulseAudioBackend: Default sample spec not valid") << endmsg; return AudioDeviceInvalidError; @@ -294,6 +285,14 @@ PulseAudioBackend::init_pulse () pa_stream_set_underflow_callback (p_stream, PulseAudioBackend::stream_xrun_cb, this); pa_stream_set_overflow_callback (p_stream, PulseAudioBackend::stream_xrun_cb, this); + pa_buffer_attr ba; + /* https://freedesktop.org/software/pulseaudio/doxygen/structpa__buffer__attr.html */ + ba.minreq = _samples_per_period * N_CHANNELS * sizeof (float); + ba.maxlength = 2 * ba.minreq; + ba.prebuf = (uint32_t)-1; + ba.tlength = (uint32_t)-1; + ba.fragsize = 0; // capture only + /* https://freedesktop.org/software/pulseaudio/doxygen/def_8h.html#a6966d809483170bc6d2e6c16188850fc */ pa_stream_flags_t sf = (pa_stream_flags_t) ( (int)PA_STREAM_START_CORKED