From 54ebd431e58c27b1896213df7f8aecb544175e4b Mon Sep 17 00:00:00 2001 From: Tom Yan Date: Wed, 6 Mar 2019 22:46:16 +0800 Subject: [PATCH] libpulseaudio: do nothing to backend when unlinking suspended sink --- packages/libpulseaudio/module-aaudio-sink.c | 4 ++-- packages/libpulseaudio/module-sles-sink.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/libpulseaudio/module-aaudio-sink.c b/packages/libpulseaudio/module-aaudio-sink.c index 2bf7a1a71..ea43c225c 100644 --- a/packages/libpulseaudio/module-aaudio-sink.c +++ b/packages/libpulseaudio/module-aaudio-sink.c @@ -239,8 +239,8 @@ static int state_func_main(pa_sink *s, pa_sink_state_t state, pa_suspend_cause_t static int state_func_io(pa_sink *s, pa_sink_state_t state, pa_suspend_cause_t suspend_cause) { struct userdata *u = s->userdata; - if ((PA_SINK_IS_OPENED(s->thread_info.state) && state == PA_SINK_SUSPENDED) || - (PA_SINK_IS_LINKED(s->thread_info.state) && state == PA_SINK_UNLINKED)) { + if (PA_SINK_IS_OPENED(s->thread_info.state) && + (state == PA_SINK_SUSPENDED || state == PA_SINK_UNLINKED)) { if (!u->no_close) AAudioStream_close(u->stream); else diff --git a/packages/libpulseaudio/module-sles-sink.c b/packages/libpulseaudio/module-sles-sink.c index c7f08008b..7b08c79ed 100644 --- a/packages/libpulseaudio/module-sles-sink.c +++ b/packages/libpulseaudio/module-sles-sink.c @@ -224,8 +224,8 @@ finish: static int state_func(pa_sink *s, pa_sink_state_t state, pa_suspend_cause_t suspend_cause) { struct userdata *u = s->userdata; - if ((PA_SINK_IS_OPENED(s->state) && state == PA_SINK_SUSPENDED) || - (PA_SINK_IS_LINKED(s->state) && state == PA_SINK_UNLINKED)) + if (PA_SINK_IS_OPENED(s->state) && + (state == PA_SINK_SUSPENDED || state == PA_SINK_UNLINKED)) (*u->bqPlayerPlay)->SetPlayState(u->bqPlayerPlay, SL_PLAYSTATE_STOPPED); else if ((s->state == PA_SINK_SUSPENDED || s->state == PA_SINK_INIT) && PA_SINK_IS_OPENED(state))