diff options
author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-02-05 12:26:57 +0200 |
---|---|---|
committer | Szymon Janc <szymon.janc@tieto.com> | 2014-02-05 14:44:20 +0100 |
commit | d0d30cace489348d12755540ae9308222db97eb5 (patch) | |
tree | ae068faea7a66d0a2c67b67daa8e45918b1a76cd /android/avrcp.c | |
parent | ed713a8319495c6f51f97adc3cc4aca65c56619b (diff) | |
download | bluez-d0d30cace489348d12755540ae9308222db97eb5.tar.gz |
android/AVRCP: Add bt_avrcp_connect
This adds bt_avrcp_connect function which can be used to request AVRCP
connections.
Diffstat (limited to 'android/avrcp.c')
-rw-r--r-- | android/avrcp.c | 60 |
1 files changed, 55 insertions, 5 deletions
diff --git a/android/avrcp.c b/android/avrcp.c index ef833dfe0..8600d9885 100644 --- a/android/avrcp.c +++ b/android/avrcp.c @@ -54,6 +54,7 @@ static GIOChannel *server = NULL; struct avrcp_device { bdaddr_t dst; struct avctp *session; + GIOChannel *io; }; static const struct ipc_handler cmd_handlers[] = { @@ -197,17 +198,20 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer user_data) } ba2str(&dst, address); - DBG("Incoming connection from %s", address); l = g_slist_find_custom(devices, &dst, device_cmp); if (l) { - error("Unexpected connection"); - return; + dev = l->data; + if (dev->session) { + error("Unexpected connection"); + return; + } + } else { + DBG("Incoming connection from %s", address); + dev = avrcp_device_new(&dst); } fd = g_io_channel_unix_get_fd(chan); - - dev = avrcp_device_new(&dst); dev->session = avctp_new(fd, imtu, omtu, 0x0100); if (!dev->session) { @@ -222,6 +226,11 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer user_data) g_io_channel_set_close_on_unref(chan, FALSE); + if (dev->io) { + g_io_channel_unref(dev->io); + dev->io = NULL; + } + DBG("%s connected", address); } @@ -288,3 +297,44 @@ void bt_avrcp_unregister(void) server = NULL; } } + +static bool avrcp_device_connect(struct avrcp_device *dev, BtIOConnect cb) +{ + GError *err = NULL; + + dev->io = bt_io_connect(cb, dev, NULL, &err, + BT_IO_OPT_SOURCE_BDADDR, &adapter_addr, + BT_IO_OPT_DEST_BDADDR, &dev->dst, + BT_IO_OPT_PSM, L2CAP_PSM_AVCTP, + BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM, + BT_IO_OPT_INVALID); + if (err) { + error("%s", err->message); + g_error_free(err); + return false; + } + + return true; +} + +void bt_avrcp_connect(const bdaddr_t *dst) +{ + struct avrcp_device *dev; + char addr[18]; + GSList *l; + + DBG(""); + + l = g_slist_find_custom(devices, dst, device_cmp); + if (l) + return; + + dev = avrcp_device_new(dst); + if (!avrcp_device_connect(dev, connect_cb)) { + avrcp_device_free(dev); + return; + } + + ba2str(&dev->dst, addr); + DBG("connecting to %s", addr); +} |