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

bluetooth: Refactor parse_audio_property() to support more properties

Browse source 
The old implementation is limited to parsing the profile state, but
the D-Bus API actually exposes many more properties that are currently
not being considered, specially within org.bluez.Headset.
This commit is contained in:
Mikel Astiz 2012-12-10 08:30:37 +01:00 • committed by Tanu Kaskinen
parent 726435045e
commit ab26cafaf4
1 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -455,12 +455,19 @@ static int parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i) {
return 0; return 0;
} }
static int parse_audio_property(pa_bluetooth_discovery *u, int *state, DBusMessageIter *i) { static int parse_audio_property(pa_bluetooth_device *d, const char *interface, DBusMessageIter *i) {
const char *key; const char *key;
DBusMessageIter variant_i; DBusMessageIter variant_i;
bool is_audio_interface;
enum profile p = PROFILE_OFF;
pa_assert(u); pa_assert(d);
pa_assert(state); pa_assert(interface);
pa_assert(i);
if (!(is_audio_interface = pa_streq(interface, "org.bluez.Audio")))
if (profile_from_interface(interface, &p) < 0)
return 0; /* Interface not known so silently ignore property */
key = check_variant_property(i); key = check_variant_property(i);
if (key == NULL) if (key == NULL)
@ -478,8 +485,21 @@ static int parse_audio_property(pa_bluetooth_discovery *u, int *state, DBusMessa
dbus_message_iter_get_basic(&variant_i, &value); dbus_message_iter_get_basic(&variant_i, &value);
if (pa_streq(key, "State")) { if (pa_streq(key, "State")) {
*state = pa_bt_audio_state_from_string(value); pa_bt_audio_state_t state = pa_bt_audio_state_from_string(value);
pa_log_debug("dbus: property 'State' changed to value '%s'", value);
pa_log_debug("Device %s interface %s property 'State' changed to value '%s'", d->path, interface, value);
if (state == PA_BT_AUDIO_STATE_INVALID)
return -1;
if (is_audio_interface) {
d->audio_state = state;
break;
}
pa_assert(p != PROFILE_OFF);
d->profile_state[p] = state;
} }
break; break;
@ -595,7 +615,6 @@ static void get_properties_reply(DBusPendingCall *pending, void *userdata) {
if (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_DICT_ENTRY) { if (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_DICT_ENTRY) {
DBusMessageIter dict_i; DBusMessageIter dict_i;
enum profile profile;
dbus_message_iter_recurse(&element_i, &dict_i); dbus_message_iter_recurse(&element_i, &dict_i);
@ -611,18 +630,9 @@ static void get_properties_reply(DBusPendingCall *pending, void *userdata) {
if (parse_device_property(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 (parse_audio_property(d, dbus_message_get_interface(p->message), &dict_i) < 0)
if (parse_audio_property(y, &d->audio_state, &dict_i) < 0)
goto finish; goto finish;
} else if (profile_from_interface(dbus_message_get_interface(p->message), &profile) >= 0) {
pa_bt_audio_state_t state;
if (parse_audio_property(y, &state, &dict_i) < 0)
goto finish;
d->profile_state[profile] = state;
}
} }
dbus_message_iter_next(&element_i); dbus_message_iter_next(&element_i);
@ -863,7 +873,6 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
if ((d = pa_hashmap_get(y->devices, dbus_message_get_path(m)))) { if ((d = pa_hashmap_get(y->devices, dbus_message_get_path(m)))) {
DBusMessageIter arg_i; DBusMessageIter arg_i;
enum profile profile;
bool old_any_connected = pa_bluetooth_device_any_audio_connected(d); bool old_any_connected = pa_bluetooth_device_any_audio_connected(d);
if (!dbus_message_iter_init(m, &arg_i)) { if (!dbus_message_iter_init(m, &arg_i)) {
@ -875,19 +884,9 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
if (parse_device_property(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 (parse_audio_property(d, dbus_message_get_interface(m), &arg_i) < 0)
if (parse_audio_property(y, &d->audio_state, &arg_i) < 0)
goto fail; goto fail;
} else if (profile_from_interface(dbus_message_get_interface(m), &profile) >= 0) {
pa_bt_audio_state_t state;
if (parse_audio_property(y, &state, &arg_i) < 0)
goto fail;
d->profile_state[profile] = state;
}
if (old_any_connected != pa_bluetooth_device_any_audio_connected(d)) if (old_any_connected != pa_bluetooth_device_any_audio_connected(d))
run_callback(d, FALSE); run_callback(d, FALSE);
} }