diff options
| author | Mikel Astiz <mikel.astiz@bmw-carit.de> | 2012-12-03 11:03:57 +0100 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2012-12-04 03:07:44 +0200 |
| commit | 1dcdb96ee5384d16644271233ff93dbdd2e6c158 (patch) | |
| tree | 3823f3ede57e4e84d390b5e4900c18ccd1e91c48 | |
| parent | 6ef23eb4af309018b5e0e834d634e92deef79877 (diff) | |
| download | pulseaudio-1dcdb96ee5384d16644271233ff93dbdd2e6c158.tar.gz | |
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().
| -rw-r--r-- | src/modules/bluetooth/module-bluetooth-device.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c index 506a47990..7d89f6ca1 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; |