summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/source.c
diff options
context:
space:
mode:
authorColin Guthrie <cguthrie@mandriva.org>2010-10-01 01:26:43 +0100
committerColin Guthrie <cguthrie@mandriva.org>2010-10-01 01:39:35 +0100
commitd195a549799743806a62c4f05017b45fd8b51ab0 (patch)
tree7edc7dbeda375ba8704ee7b8dbf3ae0c0d7e25cb /src/pulsecore/source.c
parentb02abcb61303a571eeec80f7f1917a256d68290f (diff)
suspend: Do not assert when checking for device suspended status and a stream is not linked.
When looping through the streams on a given device checking to see if the stream is 'active' there should be no assert if the stream is not linked, it should simply be ignored. This assert can be hit if a sink and a sink input are both created and setup but the final put calls are left to the end as is done in module-ladspa-sink. While the order of the calls in module-ladspa-sink could be altered, we should deal gracefully with the way it is now and not complain about ending up in this state. A trigger case was trivial: 1. Load a ladspa-sink. 2. Play a stream and move it to it. 3. Unload the module, then reload it. 4. Due to module-stream-restore and module-suspend-on-idle, the hook callbacks will ultimately hit this assert. Thanks to Kim Therkelsen for highlighting this issue.
Diffstat (limited to 'src/pulsecore/source.c')
-rw-r--r--src/pulsecore/source.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 415c54bc..412a3db9 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -996,7 +996,14 @@ unsigned pa_source_check_suspend(pa_source *s) {
pa_source_output_state_t st;
st = pa_source_output_get_state(o);
- pa_assert(PA_SOURCE_OUTPUT_IS_LINKED(st));
+
+ /* We do not assert here. It is perfectly valid for a source output to
+ * be in the INIT state (i.e. created, marked done but not yet put)
+ * and we should not care if it's unlinked as it won't contribute
+ * towarards our busy status.
+ */
+ if (!PA_SOURCE_OUTPUT_IS_LINKED(st))
+ continue;
if (st == PA_SOURCE_OUTPUT_CORKED)
continue;