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

bluetooth: Add a pa_bluetooth_discovery pointer to pa_bluetooth_device.

Browse source 
This simplifies some function argument lists.
This commit is contained in:
Tanu Kaskinen 2012-11-20 14:51:27 +02:00
parent 868158f115
commit 55baf5424e
2 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/modules/bluetooth/bluetooth-util.c
View file

@ -109,12 +109,16 @@ static void uuid_free(pa_bluetooth_uuid *u) {
pa_xfree(u); pa_xfree(u);
} }
static pa_bluetooth_device* device_new(const char *path) { static pa_bluetooth_device* device_new(pa_bluetooth_discovery *discovery, const char *path) {
pa_bluetooth_device *d; pa_bluetooth_device *d;
unsigned i; unsigned i;
pa_assert(discovery);
pa_assert(path);
d = pa_xnew(pa_bluetooth_device, 1); d = pa_xnew(pa_bluetooth_device, 1);
d->discovery = discovery;
d->dead = FALSE; d->dead = FALSE;
d->device_info_valid = 0; d->device_info_valid = 0;
@ -300,11 +304,10 @@ static int parse_adapter_property(pa_bluetooth_discovery *y, DBusMessageIter *i)
return 0; return 0;
} }
static int parse_device_property(pa_bluetooth_discovery *y, pa_bluetooth_device *d, DBusMessageIter *i) { static int parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i) {
const char *key; const char *key;
DBusMessageIter variant_i; DBusMessageIter variant_i;
pa_assert(y);
pa_assert(d); pa_assert(d);
key = check_variant_property(i); key = check_variant_property(i);
@ -397,19 +400,19 @@ static int parse_device_property(pa_bluetooth_discovery *y, pa_bluetooth_device
/* Vudentz said the interfaces are here when the UUIDs are announced */ /* Vudentz said the interfaces are here when the UUIDs are announced */
if (strcasecmp(HSP_AG_UUID, value) == 0 || strcasecmp(HFP_AG_UUID, value) == 0) { if (strcasecmp(HSP_AG_UUID, value) == 0 || strcasecmp(HFP_AG_UUID, value) == 0) {
pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.HandsfreeGateway", "GetProperties")); pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.HandsfreeGateway", "GetProperties"));
send_and_add_to_pending(y, m, get_properties_reply, d); send_and_add_to_pending(d->discovery, m, get_properties_reply, d);
has_audio = TRUE; has_audio = TRUE;
} else if (strcasecmp(HSP_HS_UUID, value) == 0 || strcasecmp(HFP_HS_UUID, value) == 0) { } else if (strcasecmp(HSP_HS_UUID, value) == 0 || strcasecmp(HFP_HS_UUID, value) == 0) {
pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.Headset", "GetProperties")); pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.Headset", "GetProperties"));
send_and_add_to_pending(y, m, get_properties_reply, d); send_and_add_to_pending(d->discovery, m, get_properties_reply, d);
has_audio = TRUE; has_audio = TRUE;
} else if (strcasecmp(A2DP_SINK_UUID, value) == 0) { } else if (strcasecmp(A2DP_SINK_UUID, value) == 0) {
pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.AudioSink", "GetProperties")); pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.AudioSink", "GetProperties"));
send_and_add_to_pending(y, m, get_properties_reply, d); send_and_add_to_pending(d->discovery, m, get_properties_reply, d);
has_audio = TRUE; has_audio = TRUE;
} else if (strcasecmp(A2DP_SOURCE_UUID, value) == 0) { } else if (strcasecmp(A2DP_SOURCE_UUID, value) == 0) {
pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.AudioSource", "GetProperties")); pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.AudioSource", "GetProperties"));
send_and_add_to_pending(y, m, get_properties_reply, d); send_and_add_to_pending(d->discovery, m, get_properties_reply, d);
has_audio = TRUE; has_audio = TRUE;
} }
@ -419,7 +422,7 @@ static int parse_device_property(pa_bluetooth_discovery *y, pa_bluetooth_device
/* this might eventually be racy if .Audio is not there yet, but the State change will come anyway later, so this call is for cold-detection mostly */ /* this might eventually be racy if .Audio is not there yet, but the State change will come anyway later, so this call is for cold-detection mostly */
if (has_audio) { if (has_audio) {
pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.Audio", "GetProperties")); pa_assert_se(m = dbus_message_new_method_call("org.bluez", d->path, "org.bluez.Audio", "GetProperties"));
send_and_add_to_pending(y, m, get_properties_reply, d); send_and_add_to_pending(d->discovery, m, get_properties_reply, d);
} }
} }
@ -464,15 +467,14 @@ static int parse_audio_property(pa_bluetooth_discovery *u, int *state, DBusMessa
return 0; return 0;
} }
static void run_callback(pa_bluetooth_discovery *y, pa_bluetooth_device *d, pa_bool_t dead) { static void run_callback(pa_bluetooth_device *d, pa_bool_t dead) {
pa_assert(y);
pa_assert(d); pa_assert(d);
if (!device_is_audio(d)) if (!device_is_audio(d))
return; return;
d->dead = dead; d->dead = dead;
pa_hook_fire(&y->hook, d); pa_hook_fire(&d->discovery->hook, d);
} }
static void remove_all_devices(pa_bluetooth_discovery *y) { static void remove_all_devices(pa_bluetooth_discovery *y) {
@ -482,7 +484,7 @@ static void remove_all_devices(pa_bluetooth_discovery *y) {
while ((d = pa_hashmap_steal_first(y->devices))) { while ((d = pa_hashmap_steal_first(y->devices))) {
pa_hook_fire(&d->hooks[PA_BLUETOOTH_DEVICE_HOOK_REMOVED], NULL); pa_hook_fire(&d->hooks[PA_BLUETOOTH_DEVICE_HOOK_REMOVED], NULL);
run_callback(y, d, TRUE); run_callback(d, TRUE);
device_free(d); device_free(d);
} }
} }
@ -498,7 +500,7 @@ static pa_bluetooth_device *found_device(pa_bluetooth_discovery *y, const char*
if (d) if (d)
return d; return d;
d = device_new(path); d = device_new(y, path);
pa_hashmap_put(y->devices, d->path, d); pa_hashmap_put(y->devices, d->path, d);
@ -580,7 +582,7 @@ static void get_properties_reply(DBusPendingCall *pending, void *userdata) {
goto finish; goto finish;
} else if (dbus_message_has_interface(p->message, "org.bluez.Device")) { } else if (dbus_message_has_interface(p->message, "org.bluez.Device")) {
if (parse_device_property(y, d, &dict_i) < 0) if (parse_device_property(d, &dict_i) < 0)
goto finish; goto finish;
} else if (dbus_message_has_interface(p->message, "org.bluez.Audio")) { } else if (dbus_message_has_interface(p->message, "org.bluez.Audio")) {
@ -611,7 +613,7 @@ static void get_properties_reply(DBusPendingCall *pending, void *userdata) {
finish: finish:
if (d != NULL) if (d != NULL)
run_callback(y, d, FALSE); run_callback(d, FALSE);
finish2: finish2:
dbus_message_unref(r); dbus_message_unref(r);
@ -803,7 +805,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
if ((d = pa_hashmap_remove(y->devices, path))) { if ((d = pa_hashmap_remove(y->devices, path))) {
pa_hook_fire(&d->hooks[PA_BLUETOOTH_DEVICE_HOOK_REMOVED], NULL); pa_hook_fire(&d->hooks[PA_BLUETOOTH_DEVICE_HOOK_REMOVED], NULL);
run_callback(y, d, TRUE); run_callback(d, TRUE);
device_free(d); device_free(d);
} }
@ -853,7 +855,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
} }
if (dbus_message_has_interface(m, "org.bluez.Device")) { if (dbus_message_has_interface(m, "org.bluez.Device")) {
if (parse_device_property(y, d, &arg_i) < 0) if (parse_device_property(d, &arg_i) < 0)
goto fail; goto fail;
} else if (dbus_message_has_interface(m, "org.bluez.Audio")) { } else if (dbus_message_has_interface(m, "org.bluez.Audio")) {
@ -877,7 +879,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
goto fail; goto fail;
} }
run_callback(y, d, FALSE); run_callback(d, FALSE);
} }
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;

1
src/modules/bluetooth/bluetooth-util.h
View file

@ -99,6 +99,7 @@ typedef enum pa_bluetooth_device_hook {
} pa_bluetooth_device_hook_t; } pa_bluetooth_device_hook_t;
struct pa_bluetooth_device { struct pa_bluetooth_device {
pa_bluetooth_discovery *discovery;
pa_bool_t dead; pa_bool_t dead;
int device_info_valid; /* 0: no results yet; 1: good results; -1: bad results ... */ int device_info_valid; /* 0: no results yet; 1: good results; -1: bad results ... */