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

bluetooth: Fix unacquired transports during sink resume

Browse source 
The sink can be resumed while the source is still in PA_SOURCE_INIT.
This is the case if a module such as module-stream-restore routes the
audio to the sink during pa_sink_put(), leading to an inconsistent
state: the sink stays RUNNING but the transport is not actually
acquired.
This commit is contained in:
Mikel Astiz 2012-11-28 19:20:58 +01:00 • committed by Arun Raghavan
parent bbb47c67bb
commit 5a791f8a16
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -470,7 +470,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
break; break;
/* Resume the device if the source was suspended as well */ /* Resume the device if the source was suspended as well */
if (!u->source || u->source->state == PA_SOURCE_SUSPENDED) { if (!u->source || !PA_SOURCE_IS_OPENED(u->source->thread_info.state)) {
if (bt_transport_acquire(u, TRUE) < 0) if (bt_transport_acquire(u, TRUE) < 0)
failed = TRUE; failed = TRUE;
} }
@ -545,7 +545,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
break; break;
/* Resume the device if the sink was suspended as well */ /* Resume the device if the sink was suspended as well */
if (!u->sink || u->sink->thread_info.state == PA_SINK_SUSPENDED) { if (!u->sink || !PA_SINK_IS_OPENED(u->sink->thread_info.state)) {
if (bt_transport_acquire(u, TRUE) < 0) if (bt_transport_acquire(u, TRUE) < 0)
failed = TRUE; failed = TRUE;
} }