mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink-input, source-output: Do routing related validity checks immediately after routing

Browse source 
It's more logical that way.
This commit is contained in:
Tanu Kaskinen 2013-12-03 16:54:48 +02:00
parent d78d8246b4
commit 71816ecb7f
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -325,8 +325,13 @@ int pa_sink_input_new(
pa_return_val_if_fail(sink, -PA_ERR_NOENTITY);
pa_sink_input_new_data_set_sink(data, sink, false);
}
/* Routing's done, we have a sink. Now let's fix the format and set up the
* sample spec */
pa_return_val_if_fail(PA_SINK_IS_LINKED(pa_sink_get_state(data->sink)), -PA_ERR_BADSTATE);
pa_return_val_if_fail(!data->sync_base || (data->sync_base->sink == data->sink
&& pa_sink_input_get_state(data->sync_base) == PA_SINK_INPUT_CORKED),
-PA_ERR_INVALID);
/* Routing's done, we have a sink. Now let's fix the format. */
/* If something didn't pick a format for us, pick the top-most format since
* we assume this is sorted in priority order */
@ -353,8 +358,6 @@ int pa_sink_input_new(
if (pa_format_info_is_pcm(data->format) && pa_channel_map_valid(&map))
pa_sink_input_new_data_set_channel_map(data, &map);
pa_return_val_if_fail(PA_SINK_IS_LINKED(pa_sink_get_state(data->sink)), -PA_ERR_BADSTATE);
pa_return_val_if_fail(!data->sync_base || (data->sync_base->sink == data->sink && pa_sink_input_get_state(data->sync_base) == PA_SINK_INPUT_CORKED), -PA_ERR_INVALID);
r = check_passthrough_connection(pa_sink_input_new_data_is_passthrough(data), data->sink);
if (r != PA_OK)

9
src/pulsecore/source-output.c
View file

@ -268,8 +268,10 @@ int pa_source_output_new(
pa_source_output_new_data_set_source(data, source, false);
}
/* Routing's done, we have a source. Now let's fix the format and set up the
* sample spec */
pa_return_val_if_fail(PA_SOURCE_IS_LINKED(pa_source_get_state(data->source)), -PA_ERR_BADSTATE);
pa_return_val_if_fail(!data->direct_on_input || data->direct_on_input->sink == data->source->monitor_of, -PA_ERR_INVALID);
/* Routing's done, we have a source. Now let's fix the format. */
/* If something didn't pick a format for us, pick the top-most format since
* we assume this is sorted in priority order */
@ -296,9 +298,6 @@ int pa_source_output_new(
if (pa_format_info_is_pcm(data->format) && pa_channel_map_valid(&map))
pa_source_output_new_data_set_channel_map(data, &map);
pa_return_val_if_fail(PA_SOURCE_IS_LINKED(pa_source_get_state(data->source)), -PA_ERR_BADSTATE);
pa_return_val_if_fail(!data->direct_on_input || data->direct_on_input->sink == data->source->monitor_of, -PA_ERR_INVALID);
if (!data->sample_spec_is_set)
data->sample_spec = data->source->sample_spec;