summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.dentz@openbossa.org>2009-01-08 17:18:07 -0300
committerJohan Hedberg <johan.hedberg@nokia.com>2009-01-08 23:44:16 +0200
commit60ec17b68922904833973af118ff91e0f1df1b04 (patch)
tree286af09976dccb93d470d690d5f34f455f696e04 /audio
parent193ad2bbf689556c5cf96ff8f6368965223467bd (diff)
Make audio plugin to use audio_device sufix instead of device_.
To prevent future name clashes with btd_device API.
Diffstat (limited to 'audio')
-rw-r--r--audio/device.c7
-rw-r--r--audio/device.h7
-rw-r--r--audio/manager.c6
3 files changed, 11 insertions, 9 deletions
diff --git a/audio/device.c b/audio/device.c
index 6c2c20aa..6f59746d 100644
--- a/audio/device.c
+++ b/audio/device.c
@@ -63,7 +63,7 @@ static void device_free(struct audio_device *dev)
g_free(dev);
}
-struct audio_device *device_register(DBusConnection *conn,
+struct audio_device *audio_device_register(DBusConnection *conn,
const char *path, const bdaddr_t *src,
const bdaddr_t *dst)
{
@@ -82,7 +82,8 @@ struct audio_device *device_register(DBusConnection *conn,
return dev;
}
-gboolean device_is_connected(struct audio_device *dev, const char *interface)
+gboolean audio_device_is_connected(struct audio_device *dev,
+ const char *interface)
{
if (!interface) {
if ((dev->sink || dev->source) &&
@@ -108,7 +109,7 @@ gboolean device_is_connected(struct audio_device *dev, const char *interface)
return FALSE;
}
-void device_unregister(struct audio_device *device)
+void audio_device_unregister(struct audio_device *device)
{
if (device->headset)
headset_unregister(device);
diff --git a/audio/device.h b/audio/device.h
index a50214da..2f626a54 100644
--- a/audio/device.h
+++ b/audio/device.h
@@ -65,10 +65,11 @@ struct audio_device {
struct target *target;
};
-struct audio_device *device_register(DBusConnection *conn,
+struct audio_device *audio_device_register(DBusConnection *conn,
const char *path, const bdaddr_t *src,
const bdaddr_t *dst);
-void device_unregister(struct audio_device *device);
+void audio_device_unregister(struct audio_device *device);
-gboolean device_is_connected(struct audio_device *dev, const char *interface);
+gboolean audio_device_is_connected(struct audio_device *dev,
+ const char *interface);
diff --git a/audio/manager.c b/audio/manager.c
index 21ace0b5..4c9248f8 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -666,7 +666,7 @@ static void audio_remove(struct btd_device *device)
devices = g_slist_remove(devices, dev);
- device_unregister(dev);
+ audio_device_unregister(dev);
}
static struct audio_adapter *create_audio_adapter(const char *path, bdaddr_t *src)
@@ -1007,7 +1007,7 @@ struct audio_device *manager_find_device(const bdaddr_t *bda, const char *interf
&& !dev->control)
continue;
- if (connected && !device_is_connected(dev, interface))
+ if (connected && !audio_device_is_connected(dev, interface))
continue;
return dev;
@@ -1049,7 +1049,7 @@ struct audio_device *manager_get_device(const bdaddr_t *src,
path = device_get_path(device);
- dev = device_register(connection, path, src, dst);
+ dev = audio_device_register(connection, path, src, dst);
if (!dev)
return NULL;