mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't break if we fail to resume access to an audio device

Browse source
This commit is contained in:
Lennart Poettering 2008-07-23 16:50:16 +02:00
parent 7140bdd9a5
commit 1f10ca4e4b
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/pulsecore/sink.c
View file

@ -261,22 +261,31 @@ pa_sink* pa_sink_new(
static int sink_set_state(pa_sink *s, pa_sink_state_t state) { static int sink_set_state(pa_sink *s, pa_sink_state_t state) {
int ret; int ret;
pa_bool_t suspend_change; pa_bool_t suspend_change;
pa_sink_state_t original_state;
pa_assert(s); pa_assert(s);
if (s->state == state) if (s->state == state)
return 0; return 0;
original_state = s->state;
suspend_change = suspend_change =
(s->state == PA_SINK_SUSPENDED && PA_SINK_IS_OPENED(state)) || (original_state == PA_SINK_SUSPENDED && PA_SINK_IS_OPENED(state)) ||
(PA_SINK_IS_OPENED(s->state) && state == PA_SINK_SUSPENDED); (PA_SINK_IS_OPENED(original_state) && state == PA_SINK_SUSPENDED);
if (s->set_state) if (s->set_state)
if ((ret = s->set_state(s, state)) < 0) if ((ret = s->set_state(s, state)) < 0)
return -1; return ret;
if (s->asyncmsgq) if (s->asyncmsgq)
pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_SET_STATE, PA_UINT_TO_PTR(state), 0, NULL) == 0); if ((ret = pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_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; s->state = state;

17
src/pulsecore/source.c
View file

@ -224,22 +224,31 @@ pa_source* pa_source_new(
static int source_set_state(pa_source *s, pa_source_state_t state) { static int source_set_state(pa_source *s, pa_source_state_t state) {
int ret; int ret;
pa_bool_t suspend_change; pa_bool_t suspend_change;
pa_source_state_t original_state;
pa_assert(s); pa_assert(s);
if (s->state == state) if (s->state == state)
return 0; return 0;
original_state = s->state;
suspend_change = suspend_change =
(s->state == PA_SOURCE_SUSPENDED && PA_SOURCE_IS_OPENED(state)) || (original_state == PA_SOURCE_SUSPENDED && PA_SOURCE_IS_OPENED(state)) ||
(PA_SOURCE_IS_OPENED(s->state) && state == PA_SOURCE_SUSPENDED); (PA_SOURCE_IS_OPENED(original_state) && state == PA_SOURCE_SUSPENDED);
if (s->set_state) if (s->set_state)
if ((ret = s->set_state(s, state)) < 0) if ((ret = s->set_state(s, state)) < 0)
return -1; return ret;
if (s->asyncmsgq) 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; s->state = state;