mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

call _kill functions instead of _unlink since the latter should only be called be the stream implementor

Browse source
This commit is contained in:
Lennart Poettering 2009-02-12 03:39:56 +01:00
parent f0cc23d6e5
commit 1837a96e64
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pulsecore/sink.c
View file

@ -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)))) { while ((i = PA_SINK_INPUT(pa_queue_pop(q)))) {
if (pa_sink_input_finish_move(i, s, save) < 0) 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); 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)))) { 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) { 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); pa_sink_input_unref(i);
} }
} }

4
src/pulsecore/source.c
View file

@ -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)))) { while ((o = PA_SOURCE_OUTPUT(pa_queue_pop(q)))) {
if (pa_source_output_finish_move(o, s, save) < 0) 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); 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)))) { 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) { 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); pa_source_output_unref(o);
} }
} }