bluetooth: Trivially refactor to call setup_stream() directly

If the transport is already acquired and the stream needs to be started,
call setup_stream() directly instead of bt_transport_acquire(u, TRUE).
Both calls are identical in these conditions, with the exception of the
log trace which has now been moved to setup_stream().
This commit is contained in:
Mikel Astiz 2012-12-03 11:03:57 +01:00 committed by Tanu Kaskinen
parent 6ef23eb4af
commit 1dcdb96ee5

View file

@ -284,6 +284,8 @@ static void setup_stream(struct userdata *u) {
struct pollfd *pollfd; struct pollfd *pollfd;
int one; int one;
pa_log_info("Transport %s resuming", u->transport->path);
bt_transport_config_mtu(u); bt_transport_config_mtu(u);
pa_make_fd_nonblock(u->stream_fd); pa_make_fd_nonblock(u->stream_fd);
@ -424,7 +426,6 @@ static int bt_transport_acquire(struct userdata *u, pa_bool_t start) {
return 0; return 0;
done: done:
pa_log_info("Transport %s resuming", u->transport->path);
setup_stream(u); setup_stream(u);
return 0; return 0;
@ -1045,7 +1046,7 @@ static void thread_func(void *userdata) {
/* 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 (bt_transport_is_acquired(u))
bt_transport_acquire(u, TRUE); setup_stream(u);
for (;;) { for (;;) {
struct pollfd *pollfd; struct pollfd *pollfd;