summaryrefslogtreecommitdiffstats
path: root/audio/control.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-05-29 08:05:16 +0000
committerMarcel Holtmann <marcel@holtmann.org>2008-05-29 08:05:16 +0000
commitcaf9fdd6d0183afc3b21d1cd82eb637773c131de (patch)
treecf4034e4ffe2b65562d04663e0c88419ec1e92da /audio/control.c
parentba4e3484118a69f49772b7e8dba9d8a02f8dff61 (diff)
Replace struct device with struct audio_device
Diffstat (limited to 'audio/control.c')
-rw-r--r--audio/control.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/audio/control.c b/audio/control.c
index 9dfcd46d..b10fb1dd 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -151,7 +151,7 @@ struct avrcp_header {
#endif
struct avctp {
- struct device *dev;
+ struct audio_device *dev;
avctp_state_t state;
@@ -804,7 +804,7 @@ static void avctp_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
(GIOFunc) session_cb, session);
}
-gboolean avrcp_connect(struct device *dev)
+gboolean avrcp_connect(struct audio_device *dev)
{
struct control *control = dev->control;
struct avctp *session;
@@ -835,7 +835,7 @@ gboolean avrcp_connect(struct device *dev)
return TRUE;
}
-void avrcp_disconnect(struct device *dev)
+void avrcp_disconnect(struct audio_device *dev)
{
struct control *control = dev->control;
struct avctp *session = control->session;
@@ -924,7 +924,7 @@ static DBusHandlerResult control_is_connected(DBusConnection *conn,
DBusMessage *msg,
void *data)
{
- struct device *device = data;
+ struct audio_device *device = data;
struct control *control = device->control;
DBusMessage *reply;
dbus_bool_t connected;
@@ -954,7 +954,7 @@ static DBusSignalVTable control_signals[] = {
{ NULL, NULL }
};
-struct control *control_init(struct device *dev)
+struct control *control_init(struct audio_device *dev)
{
if (!dbus_connection_register_interface(dev->conn, dev->path,
AUDIO_CONTROL_INTERFACE,
@@ -965,7 +965,7 @@ struct control *control_init(struct device *dev)
return g_new0(struct control, 1);
}
-void control_free(struct device *dev)
+void control_free(struct audio_device *dev)
{
struct control *control = dev->control;
@@ -976,7 +976,7 @@ void control_free(struct device *dev)
dev->control = NULL;
}
-gboolean control_is_active(struct device *dev)
+gboolean control_is_active(struct audio_device *dev)
{
struct control *control = dev->control;