OSDN Git Service

audio: Update to new adapter_get_device API
authorJohan Hedberg <johan.hedberg@intel.com>
Fri, 25 Jan 2013 08:59:01 +0000 (10:59 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Fri, 25 Jan 2013 09:00:08 +0000 (11:00 +0200)
profiles/audio/avctp.c
profiles/audio/avdtp.c

index 61890cc..d2dce3e 100644 (file)
@@ -1228,13 +1228,14 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data)
        struct avctp *session;
        struct audio_device *dev;
        char address[18];
-       bdaddr_t src;
+       bdaddr_t src, dst;
        GError *err = NULL;
        uint16_t psm;
        struct btd_device *device;
 
        bt_io_get(chan, &err,
                        BT_IO_OPT_SOURCE_BDADDR, &src,
+                       BT_IO_OPT_DEST_BDADDR, &dst,
                        BT_IO_OPT_DEST, address,
                        BT_IO_OPT_PSM, &psm,
                        BT_IO_OPT_INVALID);
@@ -1247,7 +1248,7 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data)
 
        DBG("AVCTP: incoming connect from %s", address);
 
-       device = adapter_find_device(adapter_find(&src), address);
+       device = adapter_find_device(adapter_find(&src), &dst);
        if (!device)
                return;
 
index 4921fdc..0187691 100644 (file)
@@ -2476,7 +2476,7 @@ static void avdtp_confirm_cb(GIOChannel *chan, gpointer data)
 
        DBG("AVDTP: incoming connect from %s", address);
 
-       device = adapter_find_device(adapter_find(&src), address);
+       device = adapter_find_device(adapter_find(&src), &dst);
        if (!device)
                goto drop;