mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

some minor fixes and cleanups in the bt code

Browse source
This commit is contained in:
Lennart Poettering 2008-09-26 09:35:00 -07:00
parent 6188737021
commit 183f2e0bff
1 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/modules/bluetooth/module-bluetooth-discover.c
View file

@ -141,21 +141,21 @@ static void print_devices(struct device *device_list) {
while (device_list_i != NULL) { while (device_list_i != NULL) {
struct uuid *uuid_list_i = device_list_i->uuid_list; struct uuid *uuid_list_i = device_list_i->uuid_list;
if (strcmp(device_list_i->object_path, "/DEVICE_HEAD") != 0) { if (strcmp(device_list_i->object_path, "/DEVICE_HEAD") != 0) {
pa_log(" [ %s ]", device_list_i->object_path); pa_log_debug(" [ %s ]", device_list_i->object_path);
pa_log(" Name = %s", device_list_i->name); pa_log_debug(" Name = %s", device_list_i->name);
pa_log(" Paired = %d", device_list_i->paired); pa_log_debug(" Paired = %d", device_list_i->paired);
pa_log(" Adapter = %s", device_list_i->adapter->object_path); pa_log_debug(" Adapter = %s", device_list_i->adapter->object_path);
pa_log(" Alias = %s", device_list_i->alias); pa_log_debug(" Alias = %s", device_list_i->alias);
pa_log(" Connected = %d", device_list_i->connected); pa_log_debug(" Connected = %d", device_list_i->connected);
pa_log(" UUIDs = "); pa_log_debug(" UUIDs = ");
while (uuid_list_i != NULL) { while (uuid_list_i != NULL) {
if (strcmp(uuid_list_i->uuid, "UUID_HEAD") != 0) if (strcmp(uuid_list_i->uuid, "UUID_HEAD") != 0)
pa_log(" %s", uuid_list_i->uuid); pa_log(" %s", uuid_list_i->uuid);
uuid_list_i = uuid_list_i->next; uuid_list_i = uuid_list_i->next;
} }
pa_log(" Address = %s", device_list_i->address); pa_log_debug(" Address = %s", device_list_i->address);
pa_log(" Class = 0x%x", device_list_i->class); pa_log_debug(" Class = 0x%x", device_list_i->class);
pa_log(" Trusted = %d", device_list_i->trusted); pa_log_debug(" Trusted = %d", device_list_i->trusted);
} }
device_list_i = device_list_i->next; device_list_i = device_list_i->next;
} }
@ -165,9 +165,9 @@ static void print_adapters(struct adapter *adapter_list) {
struct adapter *adapter_list_i = adapter_list; struct adapter *adapter_list_i = adapter_list;
while (adapter_list_i != NULL) { while (adapter_list_i != NULL) {
if (strcmp(adapter_list_i->object_path, "/ADAPTER_HEAD") != 0) { if (strcmp(adapter_list_i->object_path, "/ADAPTER_HEAD") != 0) {
pa_log("[ %s ]", adapter_list_i->object_path); pa_log_debug("[ %s ]", adapter_list_i->object_path);
pa_log(" Mode = %s", adapter_list_i->mode); pa_log_debug(" Mode = %s", adapter_list_i->mode);
pa_log(" Address = %s", adapter_list_i->address); pa_log_debug(" Address = %s", adapter_list_i->address);
print_devices(adapter_list_i->device_list); print_devices(adapter_list_i->device_list);
} }
adapter_list_i = adapter_list_i->next; adapter_list_i = adapter_list_i->next;
@ -260,7 +260,7 @@ static void detect_devices(struct userdata *u) {
struct adapter *adapter_list_i; struct adapter *adapter_list_i;
struct device *device_list_i; struct device *device_list_i;
const char *key, *value; const char *key, *value;
unsigned int uvalue; int32_t ivalue;
pa_assert(u); pa_assert(u);
dbus_error_init(&e); dbus_error_init(&e);
@ -326,16 +326,16 @@ static void detect_devices(struct userdata *u) {
device_list_i->name = pa_xstrdup(value); device_list_i->name = pa_xstrdup(value);
} }
else if (strcmp(key, "Paired") == 0) { else if (strcmp(key, "Paired") == 0) {
dbus_message_iter_get_basic(&variant_i, &uvalue); dbus_message_iter_get_basic(&variant_i, &ivalue);
device_list_i->paired = uvalue; device_list_i->paired = ivalue;
} }
else if (strcmp(key, "Alias") == 0) { else if (strcmp(key, "Alias") == 0) {
dbus_message_iter_get_basic(&variant_i, &value); dbus_message_iter_get_basic(&variant_i, &value);
device_list_i->alias = pa_xstrdup(value); device_list_i->alias = pa_xstrdup(value);
} }
else if (strcmp(key, "Connected") == 0) { else if (strcmp(key, "Connected") == 0) {
dbus_message_iter_get_basic(&variant_i, &uvalue); dbus_message_iter_get_basic(&variant_i, &ivalue);
device_list_i->connected = uvalue; device_list_i->connected = ivalue;
} }
else if (strcmp(key, "UUIDs") == 0) { else if (strcmp(key, "UUIDs") == 0) {
DBusMessageIter uuid_i; DBusMessageIter uuid_i;
@ -363,12 +363,12 @@ static void detect_devices(struct userdata *u) {
device_list_i->address = pa_xstrdup(value); device_list_i->address = pa_xstrdup(value);
} }
else if (strcmp(key, "Class") == 0) { else if (strcmp(key, "Class") == 0) {
dbus_message_iter_get_basic(&variant_i, &uvalue); dbus_message_iter_get_basic(&variant_i, &ivalue);
device_list_i->class = uvalue; device_list_i->class = ivalue;
} }
else if (strcmp(key, "Trusted") == 0) { else if (strcmp(key, "Trusted") == 0) {
dbus_message_iter_get_basic(&variant_i, &uvalue); dbus_message_iter_get_basic(&variant_i, &ivalue);
device_list_i->trusted = uvalue; device_list_i->trusted = ivalue;
} }
} }
dbus_message_iter_next(&element_i); dbus_message_iter_next(&element_i);
@ -465,7 +465,6 @@ void pa__done(pa_module* m) {
pa_dbus_connection_unref(u->conn); pa_dbus_connection_unref(u->conn);
pa_xfree(u); pa_xfree(u);
pa_log("Unloading module-bt-discover");
return; return;
} }
@ -476,7 +475,6 @@ int pa__init(pa_module* m) {
struct userdata *u; struct userdata *u;
pa_assert(m); pa_assert(m);
pa_log("Loading module-bt-discover");
dbus_error_init(&err); dbus_error_init(&err);
m->userdata = u = pa_xnew0(struct userdata, 1); m->userdata = u = pa_xnew0(struct userdata, 1);
u->module = m; u->module = m;
@ -500,7 +498,7 @@ int pa__init(pa_module* m) {
while (adapter_list_i != NULL) { while (adapter_list_i != NULL) {
device_list_i = adapter_list_i->device_list; device_list_i = adapter_list_i->device_list;
while (device_list_i != NULL) { while (device_list_i != NULL) {
pa_log("Loading module-bt-device for %s", device_list_i->name); pa_log_debug("Loading module-bt-device for %s", device_list_i->name);
/* TODO: call module */ /* TODO: call module */
device_list_i = device_list_i->next; device_list_i = device_list_i->next;
} }