mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pacat: Don't use any buffer attr if we don't set any latency/process time params

Browse source
This commit is contained in:
Colin Guthrie 2010-02-11 23:33:19 +00:00
parent 66cfa72eb4
commit ff2091b2c4
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/utils/pacat.c
View file

@ -409,6 +409,7 @@ static void context_state_callback(pa_context *c, void *userdata) {
case PA_CONTEXT_READY: { case PA_CONTEXT_READY: {
pa_buffer_attr buffer_attr; pa_buffer_attr buffer_attr;
const pa_buffer_attr *active_buffer_attr = NULL;
pa_assert(c); pa_assert(c);
pa_assert(!stream); pa_assert(!stream);
@ -438,29 +439,33 @@ static void context_state_callback(pa_context *c, void *userdata) {
if (latency_msec > 0) { if (latency_msec > 0) {
buffer_attr.fragsize = buffer_attr.tlength = pa_usec_to_bytes(latency_msec * PA_USEC_PER_MSEC, &sample_spec); buffer_attr.fragsize = buffer_attr.tlength = pa_usec_to_bytes(latency_msec * PA_USEC_PER_MSEC, &sample_spec);
active_buffer_attr = &buffer_attr;
flags |= PA_STREAM_ADJUST_LATENCY; flags |= PA_STREAM_ADJUST_LATENCY;
} else if (latency > 0) { } else if (latency > 0) {
buffer_attr.fragsize = buffer_attr.tlength = (uint32_t) latency; buffer_attr.fragsize = buffer_attr.tlength = (uint32_t) latency;
active_buffer_attr = &buffer_attr;
flags |= PA_STREAM_ADJUST_LATENCY; flags |= PA_STREAM_ADJUST_LATENCY;
} else } else
buffer_attr.fragsize = buffer_attr.tlength = (uint32_t) -1; buffer_attr.fragsize = buffer_attr.tlength = (uint32_t) -1;
if (process_time_msec > 0) { if (process_time_msec > 0) {
buffer_attr.minreq = pa_usec_to_bytes(process_time_msec * PA_USEC_PER_MSEC, &sample_spec); buffer_attr.minreq = pa_usec_to_bytes(process_time_msec * PA_USEC_PER_MSEC, &sample_spec);
} else if (process_time > 0) active_buffer_attr = &buffer_attr;
} else if (process_time > 0) {
buffer_attr.minreq = (uint32_t) process_time; buffer_attr.minreq = (uint32_t) process_time;
else active_buffer_attr = &buffer_attr;
} else
buffer_attr.minreq = (uint32_t) -1; buffer_attr.minreq = (uint32_t) -1;
if (mode == PLAYBACK) { if (mode == PLAYBACK) {
pa_cvolume cv; pa_cvolume cv;
if (pa_stream_connect_playback(stream, device, &buffer_attr, flags, volume_is_set ? pa_cvolume_set(&cv, sample_spec.channels, volume) : NULL, NULL) < 0) { if (pa_stream_connect_playback(stream, device, active_buffer_attr, flags, volume_is_set ? pa_cvolume_set(&cv, sample_spec.channels, volume) : NULL, NULL) < 0) {
pa_log(_("pa_stream_connect_playback() failed: %s"), pa_strerror(pa_context_errno(c))); pa_log(_("pa_stream_connect_playback() failed: %s"), pa_strerror(pa_context_errno(c)));
goto fail; goto fail;
} }
} else { } else {
if (pa_stream_connect_record(stream, device, latency > 0 ? &buffer_attr : NULL, flags) < 0) { if (pa_stream_connect_record(stream, device, active_buffer_attr, flags) < 0) {
pa_log(_("pa_stream_connect_record() failed: %s"), pa_strerror(pa_context_errno(c))); pa_log(_("pa_stream_connect_record() failed: %s"), pa_strerror(pa_context_errno(c)));
goto fail; goto fail;
} }