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: Trivially remove bt_transport_is_acquired()

Browse source 
The function body is now trivial and can thus be inlined.
This commit is contained in:
Mikel Astiz 2012-12-14 15:14:35 +01:00 • committed by Tanu Kaskinen
parent d2080a59f3
commit 203c6f8ed4
1 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -321,16 +321,6 @@ static void setup_stream(struct userdata *u) {
TRUE); TRUE);
} }
static bool bt_transport_is_acquired(struct userdata *u) {
if (!u->transport_acquired) {
pa_assert(u->stream_fd < 0);
return FALSE;
} else {
/* During IO thread HUP stream_fd can be -1 */
return TRUE;
}
}
static void teardown_stream(struct userdata *u) { static void teardown_stream(struct userdata *u) {
if (u->rtpoll_item) { if (u->rtpoll_item) {
pa_rtpoll_item_free(u->rtpoll_item); pa_rtpoll_item_free(u->rtpoll_item);
@ -354,7 +344,7 @@ static void bt_transport_release(struct userdata *u) {
pa_assert(u->transport); pa_assert(u->transport);
/* Ignore if already released */ /* Ignore if already released */
if (!bt_transport_is_acquired(u)) if (!u->transport_acquired)
return; return;
pa_log_debug("Releasing transport %s", u->transport->path); pa_log_debug("Releasing transport %s", u->transport->path);
@ -369,7 +359,7 @@ static void bt_transport_release(struct userdata *u) {
static int bt_transport_acquire(struct userdata *u, pa_bool_t start) { static int bt_transport_acquire(struct userdata *u, pa_bool_t start) {
pa_assert(u->transport); pa_assert(u->transport);
if (bt_transport_is_acquired(u)) { if (u->transport_acquired) {
if (start) if (start)
goto done; goto done;
return 0; return 0;
@ -1017,7 +1007,7 @@ static void thread_func(void *userdata) {
pa_thread_mq_install(&u->thread_mq); pa_thread_mq_install(&u->thread_mq);
/* Setup the stream only if the transport was already acquired */ /* Setup the stream only if the transport was already acquired */
if (bt_transport_is_acquired(u)) if (u->transport_acquired)
setup_stream(u); setup_stream(u);
for (;;) { for (;;) {
@ -1322,7 +1312,7 @@ static void handle_transport_state_change(struct userdata *u, struct pa_bluetoot
} }
} }
if (release && bt_transport_is_acquired(u)) { if (release && u->transport_acquired) {
/* FIXME: this release is racy, since the audio stream might have /* FIXME: this release is racy, since the audio stream might have
been set up again in the meantime (but not processed yet by PA). been set up again in the meantime (but not processed yet by PA).
BlueZ should probably release the transport automatically, and BlueZ should probably release the transport automatically, and
@ -1647,7 +1637,7 @@ static int add_sink(struct userdata *u) {
} }
connect_ports(u, &data, PA_DIRECTION_OUTPUT); connect_ports(u, &data, PA_DIRECTION_OUTPUT);
if (!bt_transport_is_acquired(u)) if (!u->transport_acquired)
switch (u->profile) { switch (u->profile) {
case PROFILE_A2DP: case PROFILE_A2DP:
case PROFILE_HSP: case PROFILE_HSP:
@ -1719,7 +1709,7 @@ static int add_source(struct userdata *u) {
connect_ports(u, &data, PA_DIRECTION_INPUT); connect_ports(u, &data, PA_DIRECTION_INPUT);
if (!bt_transport_is_acquired(u)) if (!u->transport_acquired)
switch (u->profile) { switch (u->profile) {
case PROFILE_HSP: case PROFILE_HSP:
pa_assert_not_reached(); /* Profile switch should have failed */ pa_assert_not_reached(); /* Profile switch should have failed */