mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
don't break if we fail to resume access to an audio device
This commit is contained in:
parent
7140bdd9a5
commit
1f10ca4e4b
2 changed files with 26 additions and 8 deletions
|
|
@ -224,22 +224,31 @@ pa_source* pa_source_new(
|
|||
static int source_set_state(pa_source *s, pa_source_state_t state) {
|
||||
int ret;
|
||||
pa_bool_t suspend_change;
|
||||
pa_source_state_t original_state;
|
||||
|
||||
pa_assert(s);
|
||||
|
||||
if (s->state == state)
|
||||
return 0;
|
||||
|
||||
original_state = s->state;
|
||||
|
||||
suspend_change =
|
||||
(s->state == PA_SOURCE_SUSPENDED && PA_SOURCE_IS_OPENED(state)) ||
|
||||
(PA_SOURCE_IS_OPENED(s->state) && state == PA_SOURCE_SUSPENDED);
|
||||
(original_state == PA_SOURCE_SUSPENDED && PA_SOURCE_IS_OPENED(state)) ||
|
||||
(PA_SOURCE_IS_OPENED(original_state) && state == PA_SOURCE_SUSPENDED);
|
||||
|
||||
if (s->set_state)
|
||||
if ((ret = s->set_state(s, state)) < 0)
|
||||
return -1;
|
||||
return ret;
|
||||
|
||||
if (s->asyncmsgq)
|
||||
pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_STATE, PA_UINT_TO_PTR(state), 0, NULL) == 0);
|
||||
if ((ret = pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_SET_STATE, PA_UINT_TO_PTR(state), 0, NULL)) < 0) {
|
||||
|
||||
if (s->set_state)
|
||||
s->set_state(s, original_state);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
s->state = state;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue