From c560d02ccf1dd156f068b1da8a3e7d75d2319dfd Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 18 Aug 2008 19:20:42 -0300 Subject: Remove driver.c driver.h and remove workaround for to force a symbol resolution. --- audio/control.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'audio/control.c') diff --git a/audio/control.c b/audio/control.c index 2a5e5e23..82646061 100644 --- a/audio/control.c +++ b/audio/control.c @@ -46,9 +46,9 @@ #include #include -#include "dbus-service.h" #include "logging.h" #include "uinput.h" +#include "adapter.h" #include "device.h" #include "manager.h" #include "avdtp.h" @@ -629,7 +629,7 @@ static void auth_cb(DBusError *derr, void *user_data) error("Access denied: %s", derr->message); if (dbus_error_has_name(derr, DBUS_ERROR_NO_REPLY)) { debug("Canceling authorization request"); - service_cancel_auth(&session->src, &session->dst); + btd_cancel_authorization(&session->src, &session->dst); } avctp_unref(session); @@ -687,7 +687,9 @@ static void avctp_server_cb(GIOChannel *chan, int err, const bdaddr_t *src, if (avdtp_is_connected(src, dst)) goto proceed; - if (service_req_auth(src, dst, AVRCP_TARGET_UUID, auth_cb, session) < 0) + err = btd_request_authorization(src, dst, AVRCP_TARGET_UUID, + auth_cb, session); + if (err < 0) goto drop; return; -- cgit