mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-12 13:30:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink-input: Minor cleanups

Browse source 
Removes a couple of warnings and simplifies the assertion logic that
verifies format negotiation was successful.
This commit is contained in:
Arun Raghavan 2011-03-02 10:53:45 +05:30
parent e64f02ad9e
commit 5d5523604f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pulsecore/sink-input.c
View file

@ -185,9 +185,6 @@ pa_bool_t pa_sink_input_new_data_set_formats(pa_sink_input_new_data *data, pa_id
} }
void pa_sink_input_new_data_done(pa_sink_input_new_data *data) { void pa_sink_input_new_data_done(pa_sink_input_new_data *data) {
pa_format_info *f;
int i;
pa_assert(data); pa_assert(data);
if (data->req_formats) if (data->req_formats)
@ -273,11 +270,14 @@ int pa_sink_input_new(
/* Routing's done, we have a sink. Now let's fix the format and set up the /* Routing's done, we have a sink. Now let's fix the format and set up the
* sample spec */ * sample spec */
pa_return_val_if_fail(data->format || (data->nego_formats && !pa_idxset_isempty(data->nego_formats)), -PA_ERR_INVALID);
/* If something didn't pick a format for us, pick the top-most format since /* If something didn't pick a format for us, pick the top-most format since
* we assume this is sorted in priority order */ * we assume this is sorted in priority order */
if (!data->format) if (!data->format && data->nego_formats && !pa_idxset_isempty(data->nego_formats))
data->format = pa_format_info_copy(pa_idxset_first(data->nego_formats, NULL)); data->format = pa_format_info_copy(pa_idxset_first(data->nego_formats, NULL));
pa_return_val_if_fail(data->format, -PA_ERR_INVALID);
/* Now populate the sample spec and format according to the final /* Now populate the sample spec and format according to the final
* format that we've negotiated */ * format that we've negotiated */
if (PA_LIKELY(data->format->encoding == PA_ENCODING_PCM)) { if (PA_LIKELY(data->format->encoding == PA_ENCODING_PCM)) {