summaryrefslogtreecommitdiffstats
path: root/audio/control.c
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.dentz@indt.org.br>2008-08-18 19:20:42 -0300
committerLuiz Augusto von Dentz <luiz.dentz@indt.org.br>2008-08-18 19:20:42 -0300
commitc560d02ccf1dd156f068b1da8a3e7d75d2319dfd (patch)
treef0925d7821b400fe061a97d9521f78daf0ff9f66 /audio/control.c
parent0dda767d09a31eb13976371730e4cfe5e437869e (diff)
Remove driver.c driver.h and remove workaround for to force a symbol resolution.
Diffstat (limited to 'audio/control.c')
-rw-r--r--audio/control.c8
1 files changed, 5 insertions, 3 deletions
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 <dbus/dbus.h>
#include <gdbus.h>
-#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;