From 6e5ee2d7b890041a7703642c2f805bfa0b49389a Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 3 Jan 2013 12:51:19 +0200 Subject: [PATCH] audio: Prefer adapter_find functions over manager ones --- profiles/audio/avctp.c | 3 +-- profiles/audio/avdtp.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c index 013c587ab..843de82d3 100644 --- a/profiles/audio/avctp.c +++ b/profiles/audio/avctp.c @@ -49,7 +49,6 @@ #include "adapter.h" #include "../src/device.h" -#include "../src/manager.h" #include "log.h" #include "error.h" @@ -1124,7 +1123,7 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data) DBG("AVCTP: incoming connect from %s", address); - device = adapter_find_device(manager_find_adapter(&src), address); + device = adapter_find_device(adapter_find(&src), address); if (!device) return; diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c index aca7e6209..29a561976 100644 --- a/profiles/audio/avdtp.c +++ b/profiles/audio/avdtp.c @@ -48,7 +48,6 @@ #include "log.h" #include "../src/adapter.h" -#include "../src/manager.h" #include "../src/device.h" #include "device.h" @@ -2477,7 +2476,7 @@ static void avdtp_confirm_cb(GIOChannel *chan, gpointer data) DBG("AVDTP: incoming connect from %s", address); - device = adapter_find_device(manager_find_adapter(&src), address); + device = adapter_find_device(adapter_find(&src), address); if (!device) goto drop; -- 2.47.3