summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArun Raghavan <arun.raghavan@collabora.co.uk>2011-03-28 08:45:31 +0530
committerArun Raghavan <arun.raghavan@collabora.co.uk>2011-05-15 10:09:06 +0530
commita199bfb765147b3938d268a67f671646a16845c3 (patch)
tree5aa4521b559f7f07308e732ca3c0ae1197a98d3b
parent4fb68b91acef3cb37c014814d9e9de8ca9f22bf4 (diff)
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).
-rw-r--r--src/pulsecore/sink-input.c3
1 files changed, 2 insertions, 1 deletions
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;