From 22f92e198a8dbff34d467deccbbaa59ed24d0ad2 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Wed, 5 Dec 2012 11:10:22 +0100 Subject: [PATCH] audio: Don't use audio_device src and dst in manager_find_devices Use addresses taken from btd_dev reference in audio_device to get device source and destination. --- profiles/audio/manager.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/profiles/audio/manager.c b/profiles/audio/manager.c index b30f2428b..1f55df96f 100644 --- a/profiles/audio/manager.c +++ b/profiles/audio/manager.c @@ -653,15 +653,20 @@ GSList *manager_find_devices(const char *path, for (l = devices; l != NULL; l = l->next) { struct audio_device *dev = l->data; + const bdaddr_t *dev_src; + const bdaddr_t *dev_dst; + + dev_src = adapter_get_address(device_get_adapter(dev->btd_dev)); + dev_dst = device_get_address(dev->btd_dev); if ((path && (strcmp(path, "")) && strcmp(device_get_path(dev->btd_dev), path))) continue; - if ((src && bacmp(src, BDADDR_ANY)) && bacmp(&dev->src, src)) + if ((src && bacmp(src, BDADDR_ANY)) && bacmp(dev_src, src)) continue; - if ((dst && bacmp(dst, BDADDR_ANY)) && bacmp(&dev->dst, dst)) + if ((dst && bacmp(dst, BDADDR_ANY)) && bacmp(dev_dst, dst)) continue; if (interface && !strcmp(AUDIO_SINK_INTERFACE, interface) -- 2.47.3