summaryrefslogtreecommitdiffstats
path: root/audio
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
parent0dda767d09a31eb13976371730e4cfe5e437869e (diff)
Remove driver.c driver.h and remove workaround for to force a symbol resolution.
Diffstat (limited to 'audio')
-rw-r--r--audio/avdtp.c9
-rw-r--r--audio/control.c8
-rw-r--r--audio/manager.c8
3 files changed, 13 insertions, 12 deletions
diff --git a/audio/avdtp.c b/audio/avdtp.c
index bda21ac5..c215ca24 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -40,9 +40,9 @@
#include <glib.h>
#include <dbus/dbus.h>
-#include "dbus-service.h"
#include "logging.h"
+#include "adapter.h"
#include "device.h"
#include "manager.h"
#include "control.h"
@@ -2684,7 +2684,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);
}
connection_lost(session, -EACCES);
@@ -2757,8 +2757,9 @@ static void avdtp_server_cb(GIOChannel *chan, int err, const bdaddr_t *src,
(GIOFunc) session_cb, session);
g_io_channel_unref(chan);
- if (service_req_auth(src, dst, ADVANCED_AUDIO_UUID, auth_cb,
- session) < 0) {
+ err = btd_request_authorization(src, dst, ADVANCED_AUDIO_UUID,
+ auth_cb, session);
+ if (err < 0) {
avdtp_unref(session);
goto drop;
}
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;
diff --git a/audio/manager.c b/audio/manager.c
index 6d17a5fd..5a363f9c 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -51,9 +51,7 @@
#include "glib-helper.h"
#include "../src/adapter.h"
#include "../src/device.h"
-#include "../src/driver.h"
-#include "dbus-service.h"
#include "logging.h"
#include "textfile.h"
#include "ipc.h"
@@ -458,7 +456,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(&device->src, &device->dst);
+ btd_cancel_authorization(&device->src, &device->dst);
}
headset_set_state(device, HEADSET_STATE_DISCONNECTED);
@@ -512,8 +510,8 @@ static void ag_io_cb(GIOChannel *chan, int err, const bdaddr_t *src,
goto drop;
}
- err = service_req_auth(&device->src, &device->dst, uuid, auth_cb,
- device);
+ err = btd_request_authorization(&device->src, &device->dst, uuid,
+ auth_cb, device);
if (err < 0) {
debug("Authorization denied: %s", strerror(-err));
headset_close_rfcomm(device);