diff options
author | Mikel Astiz <mikel.astiz@bmw-carit.de> | 2012-08-31 12:51:06 +0200 |
---|---|---|
committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2012-09-26 19:27:14 +0800 |
commit | ebadda816d2f6faaf0130c6d4482be34b0c9b57d (patch) | |
tree | 41f5ea3b7407de19df3719605e07e86520bcbacb /src | |
parent | b8fd6f869ede117bf0a0b937c49c25c60c039b7c (diff) |
bluetooth: Acquire transport when becomes available
Try to acquire the transport as soon as the audio stream is started,
along with the availability flag update.
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/bluetooth/module-bluetooth-device.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c index 6757e87bb..369622148 100644 --- a/src/modules/bluetooth/module-bluetooth-device.c +++ b/src/modules/bluetooth/module-bluetooth-device.c @@ -1307,6 +1307,7 @@ static pa_port_available_t audio_state_to_availability(pa_bt_audio_state_t state static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *userdata) { DBusError err; struct userdata *u; + bool acquire = FALSE; pa_assert(bus); pa_assert(m); @@ -1383,6 +1384,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us pa_assert_se(port = pa_hashmap_get(u->card->ports, "hfgw-input")); pa_device_port_set_available(port, available); + + acquire = (available == PA_PORT_AVAILABLE_YES && u->profile == PROFILE_HFGW); } } else if (dbus_message_is_signal(m, "org.bluez.Headset", "PropertyChanged")) { pa_bt_audio_state_t state = parse_state_property_change(m); @@ -1396,6 +1399,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us pa_assert_se(port = pa_hashmap_get(u->card->ports, "hsp-input")); pa_device_port_set_available(port, available); + + acquire = (available == PA_PORT_AVAILABLE_YES && u->profile == PROFILE_HSP); } } else if (dbus_message_is_signal(m, "org.bluez.AudioSource", "PropertyChanged")) { pa_bt_audio_state_t state = parse_state_property_change(m); @@ -1406,6 +1411,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us pa_assert_se(port = pa_hashmap_get(u->card->ports, "a2dp-input")); pa_device_port_set_available(port, available); + + acquire = (available == PA_PORT_AVAILABLE_YES && u->profile == PROFILE_A2DP_SOURCE); } } else if (dbus_message_is_signal(m, "org.bluez.AudioSink", "PropertyChanged")) { pa_bt_audio_state_t state = parse_state_property_change(m); @@ -1416,9 +1423,20 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us pa_assert_se(port = pa_hashmap_get(u->card->ports, "a2dp-output")); pa_device_port_set_available(port, available); + + acquire = (available == PA_PORT_AVAILABLE_YES && u->profile == PROFILE_A2DP); } } + if (acquire) + if (bt_transport_acquire(u, FALSE) >= 0) { + if (u->source) + pa_source_suspend(u->source, FALSE, PA_SUSPEND_IDLE|PA_SUSPEND_USER); + + if (u->sink) + pa_sink_suspend(u->sink, FALSE, PA_SUSPEND_IDLE|PA_SUSPEND_USER); + } + fail: dbus_error_free(&err); |