summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2009-09-03 19:08:07 +0300
committerJohan Hedberg <johan.hedberg@nokia.com>2009-09-03 19:55:23 +0300
commit9c3f955375abff0d9ec2c151a5ad4b402c0ac29e (patch)
tree56dd8ef564158c9c9612c143d4312b1412bcd91c
parent9428fbcf3773e6733513b7d3f988b3d38f24abc5 (diff)
downloadbluez-9c3f955375abff0d9ec2c151a5ad4b402c0ac29e.tar.gz
Rename audio_device_is_connected more appropriately
-rw-r--r--audio/device.c2
-rw-r--r--audio/device.h2
-rw-r--r--audio/manager.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/audio/device.c b/audio/device.c
index e630e5115..85a6a78e7 100644
--- a/audio/device.c
+++ b/audio/device.c
@@ -617,7 +617,7 @@ struct audio_device *audio_device_register(DBusConnection *conn,
return dev;
}
-gboolean audio_device_is_connected(struct audio_device *dev,
+gboolean audio_device_is_active(struct audio_device *dev,
const char *interface)
{
if (!interface) {
diff --git a/audio/device.h b/audio/device.h
index 4a4805731..061c3da4f 100644
--- a/audio/device.h
+++ b/audio/device.h
@@ -77,7 +77,7 @@ struct audio_device *audio_device_register(DBusConnection *conn,
void audio_device_unregister(struct audio_device *device);
-gboolean audio_device_is_connected(struct audio_device *dev,
+gboolean audio_device_is_active(struct audio_device *dev,
const char *interface);
typedef void (*authorization_cb) (DBusError *derr, void *user_data);
diff --git a/audio/manager.c b/audio/manager.c
index e9ebde317..b807f77f4 100644
--- a/audio/manager.c
+++ b/audio/manager.c
@@ -1193,7 +1193,7 @@ struct audio_device *manager_find_device(const char *path,
&& !dev->control)
continue;
- if (connected && !audio_device_is_connected(dev, interface))
+ if (connected && !audio_device_is_active(dev, interface))
continue;
return dev;