[pulseaudio-discuss] [PATCH v1 1/3] bluetooth: Trivially refactor to call setup_stream() directly

[Mikel Astiz]

From: Mikel Astiz <mikel.astiz at bmw-carit.de>

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().
---
 src/modules/bluetooth/module-bluetooth-device.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 136c7da..3216cb2 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -284,6 +284,8 @@ static void setup_stream(struct userdata *u) {
     struct pollfd *pollfd;
     int one;
 
+    pa_log_info("Transport %s resuming", u->transport->path);
+
     bt_transport_config_mtu(u);
 
     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;
 
 done:
-    pa_log_info("Transport %s resuming", u->transport->path);
     setup_stream(u);
 
     return 0;
@@ -1045,7 +1046,7 @@ static void thread_func(void *userdata) {
 
     /* Setup the stream only if the transport was already acquired */
     if (bt_transport_is_acquired(u))
-        bt_transport_acquire(u, TRUE);
+        setup_stream(u);
 
     for (;;) {
         struct pollfd *pollfd;
-- 
1.7.11.7