mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't need to explicity check if hcid is running anymore

Browse source
This commit is contained in:
João Paulo Rechi Vita 2008-07-22 10:08:37 -03:00 • committed by Lennart Poettering
parent 2b68562323
commit 9907b461d4
1 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/modules/module-bt-discover.c
View file

@ -235,6 +235,8 @@ static void detect_adapters(struct userdata *u) {
goto fail; goto fail;
} }
dbus_message_iter_recurse(&arg_i, &element_i); dbus_message_iter_recurse(&arg_i, &element_i);
// TODO: Review error checking
// should this be changed to while (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_OBJECT_PATH) ?
while (dbus_message_iter_get_arg_type(&element_i) != DBUS_TYPE_INVALID) { while (dbus_message_iter_get_arg_type(&element_i) != DBUS_TYPE_INVALID) {
if (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_OBJECT_PATH) { if (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_OBJECT_PATH) {
dbus_message_iter_get_basic(&element_i, &value); dbus_message_iter_get_basic(&element_i, &value);
@ -318,6 +320,8 @@ static void detect_devices(struct userdata *u) {
goto fail; goto fail;
} }
dbus_message_iter_recurse(&arg_i, &element_i); dbus_message_iter_recurse(&arg_i, &element_i);
// TODO: Review error checking
// should this be changed to while (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_OBJECT_PATH) ?
while (dbus_message_iter_get_arg_type(&element_i) != DBUS_TYPE_INVALID) { while (dbus_message_iter_get_arg_type(&element_i) != DBUS_TYPE_INVALID) {
if (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_OBJECT_PATH) { if (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_OBJECT_PATH) {
dbus_message_iter_get_basic(&element_i, &value); dbus_message_iter_get_basic(&element_i, &value);
@ -523,7 +527,6 @@ int pa__init(pa_module* m) {
adapter_t *adapter_list_i; adapter_t *adapter_list_i;
device_t *device_list_i; device_t *device_list_i;
const char *value; const char *value;
unsigned int hcid_running = 0;
struct userdata *u; struct userdata *u;
pa_assert(m); pa_assert(m);
@ -539,22 +542,6 @@ int pa__init(pa_module* m) {
goto fail; goto fail;
} }
/* check if hcid is running */
arg_i = call_dbus_method(u->conn, "org.freedesktop.DBus", "/org/freedesktop/DBus" , "org.freedesktop.DBus", "ListNames");
dbus_message_iter_recurse(&arg_i, &element_i);
while (dbus_message_iter_get_arg_type(&element_i) != DBUS_TYPE_INVALID) {
if (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_STRING) {
dbus_message_iter_get_basic(&element_i, &value);
if (strcmp(value, "org.bluez") == 0)
hcid_running = 1;
}
dbus_message_iter_next(&element_i);
}
if (!hcid_running) {
pa_log("hcid not running");
goto fail;
}
/* static detection of bluetooth audio devices */ /* static detection of bluetooth audio devices */
u->adapter_list = adapter_new("/ADAPTER_HEAD"); u->adapter_list = adapter_new("/ADAPTER_HEAD");
detect_adapters(u); detect_adapters(u);