From a199bfb765147b3938d268a67f671646a16845c3 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Mon, 28 Mar 2011 08:45:31 +0530 Subject: sink-input: Don't print an error if a passthrough connection fails The assertion message is misleading, since the passthrough connection can fail for reasons the client has no control over (like other sink inputs being connected). --- src/pulsecore/sink-input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index 5e7cfd13..979dc76e 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -302,7 +302,8 @@ int pa_sink_input_new( 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); - pa_return_val_if_fail(r == PA_OK, r); + if (r != PA_OK) + return r; if (!data->sample_spec_is_set) data->sample_spec = data->sink->sample_spec; -- cgit