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

bluetooth: Replace acquire param 'start' with 'optional'

Browse source 
Make the internal function bt_transport_acquire() consistent with the
API in bluetooth-util by replacing the old 'start' parameter with
exactly the opposite: 'optional'.

Therefore, all calls to the function need to negate the second
parameter.

Note also that the name is more accurate now that setup_stream() is not
called inside bt_transport_acquire().
This commit is contained in:
Mikel Astiz 2012-12-14 15:14:40 +01:00 • committed by Tanu Kaskinen
parent 04d60ae2a0
commit e6139c8d37
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -351,7 +351,7 @@ static void bt_transport_release(struct userdata *u) {
teardown_stream(u); teardown_stream(u);
} }
static int bt_transport_acquire(struct userdata *u, pa_bool_t start) { static int bt_transport_acquire(struct userdata *u, pa_bool_t optional) {
pa_assert(u->transport); pa_assert(u->transport);
if (u->transport_acquired) if (u->transport_acquired)
@ -359,9 +359,9 @@ static int bt_transport_acquire(struct userdata *u, pa_bool_t start) {
pa_log_debug("Acquiring transport %s", u->transport->path); pa_log_debug("Acquiring transport %s", u->transport->path);
u->stream_fd = pa_bluetooth_transport_acquire(u->transport, !start, &u->read_link_mtu, &u->write_link_mtu); u->stream_fd = pa_bluetooth_transport_acquire(u->transport, optional, &u->read_link_mtu, &u->write_link_mtu);
if (u->stream_fd < 0) { if (u->stream_fd < 0) {
if (start) if (!optional)
pa_log("Failed to acquire transport %s", u->transport->path); pa_log("Failed to acquire transport %s", u->transport->path);
else else
pa_log_info("Failed optional acquire of transport %s", u->transport->path); pa_log_info("Failed optional acquire of transport %s", u->transport->path);
@ -411,7 +411,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse
/* Resume the device if the source was suspended as well */ /* Resume the device if the source was suspended as well */
if (!u->source || !PA_SOURCE_IS_OPENED(u->source->thread_info.state)) { if (!u->source || !PA_SOURCE_IS_OPENED(u->source->thread_info.state)) {
if (bt_transport_acquire(u, TRUE) < 0) if (bt_transport_acquire(u, false) < 0)
failed = TRUE; failed = TRUE;
else else
setup_stream(u); setup_stream(u);
@ -488,7 +488,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
/* Resume the device if the sink was suspended as well */ /* Resume the device if the sink was suspended as well */
if (!u->sink || !PA_SINK_IS_OPENED(u->sink->thread_info.state)) { if (!u->sink || !PA_SINK_IS_OPENED(u->sink->thread_info.state)) {
if (bt_transport_acquire(u, TRUE) < 0) if (bt_transport_acquire(u, false) < 0)
failed = TRUE; failed = TRUE;
else else
setup_stream(u); setup_stream(u);
@ -1286,7 +1286,7 @@ static void handle_transport_state_change(struct userdata *u, struct pa_bluetoot
} }
if (acquire) if (acquire)
if (bt_transport_acquire(u, FALSE) >= 0) { if (bt_transport_acquire(u, true) >= 0) {
if (u->source) { if (u->source) {
pa_log_debug("Resuming source %s, because the bluetooth audio state changed to 'playing'.", u->source->name); pa_log_debug("Resuming source %s, because the bluetooth audio state changed to 'playing'.", u->source->name);
pa_source_suspend(u->source, FALSE, PA_SUSPEND_IDLE|PA_SUSPEND_USER); pa_source_suspend(u->source, FALSE, PA_SUSPEND_IDLE|PA_SUSPEND_USER);
@ -1416,7 +1416,7 @@ static int sco_over_pcm_state_update(struct userdata *u, pa_bool_t changed) {
return -1; return -1;
} }
if (bt_transport_acquire(u, TRUE) < 0) if (bt_transport_acquire(u, false) < 0)
return -1; return -1;
setup_stream(u); setup_stream(u);
@ -1880,8 +1880,8 @@ static int setup_transport(struct userdata *u) {
u->transport = t; u->transport = t;
if (u->profile == PROFILE_A2DP_SOURCE || u->profile == PROFILE_HFGW) if (u->profile == PROFILE_A2DP_SOURCE || u->profile == PROFILE_HFGW)
bt_transport_acquire(u, FALSE); /* In case of error, the sink/sources will be created suspended */ bt_transport_acquire(u, true); /* In case of error, the sink/sources will be created suspended */
else if (bt_transport_acquire(u, TRUE) < 0) else if (bt_transport_acquire(u, false) < 0)
return -1; /* We need to fail here until the interactions with module-suspend-on-idle and alike get improved */ return -1; /* We need to fail here until the interactions with module-suspend-on-idle and alike get improved */
bt_transport_config(u); bt_transport_config(u);