summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-02-12 03:39:56 +0100
committerLennart Poettering <lennart@poettering.net>2009-02-12 03:39:56 +0100
commit1837a96e645149bf09ed09aa2f1d276ad608e749 (patch)
treea7335402f64a4895f41eb02538e26c2cb41f339b
parentf0cc23d6e5dd9ce718e66978d7de2dbc94ded537 (diff)
call _kill functions instead of _unlink since the latter should only be called be the stream implementor
-rw-r--r--src/pulsecore/sink.c4
-rw-r--r--src/pulsecore/source.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index eadef809..4f39d671 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -519,7 +519,7 @@ void pa_sink_move_all_finish(pa_sink *s, pa_queue *q, pa_bool_t save) {
while ((i = PA_SINK_INPUT(pa_queue_pop(q)))) {
if (pa_sink_input_finish_move(i, s, save) < 0)
- pa_sink_input_unlink(i);
+ pa_sink_input_kill(i);
pa_sink_input_unref(i);
}
@@ -534,7 +534,7 @@ void pa_sink_move_all_fail(pa_queue *q) {
while ((i = PA_SINK_INPUT(pa_queue_pop(q)))) {
if (pa_hook_fire(&i->core->hooks[PA_CORE_HOOK_SINK_INPUT_MOVE_FAIL], i) == PA_HOOK_OK) {
- pa_sink_input_unlink(i);
+ pa_sink_input_kill(i);
pa_sink_input_unref(i);
}
}
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index c31c89c3..0009d85c 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -458,7 +458,7 @@ void pa_source_move_all_finish(pa_source *s, pa_queue *q, pa_bool_t save) {
while ((o = PA_SOURCE_OUTPUT(pa_queue_pop(q)))) {
if (pa_source_output_finish_move(o, s, save) < 0)
- pa_source_output_unlink(o);
+ pa_source_output_kill(o);
pa_source_output_unref(o);
}
@@ -473,7 +473,7 @@ void pa_source_move_all_fail(pa_queue *q) {
while ((o = PA_SOURCE_OUTPUT(pa_queue_pop(q)))) {
if (pa_hook_fire(&o->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_MOVE_FAIL], o) == PA_HOOK_OK) {
- pa_source_output_unlink(o);
+ pa_source_output_kill(o);
pa_source_output_unref(o);
}
}