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: Refactor parsing of signal PropertyChanged

Browse source 
Wrap the code parsing the PropertyChanged signal into a helper function
that will return the new state of the interface.
This commit is contained in:
Mikel Astiz 2012-08-31 12:50:56 +02:00 • committed by Arun Raghavan
parent 4d2748ef5c
commit 431f56fd68
1 changed files with 47 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/modules/bluetooth/module-bluetooth-device.c
View file

@ -1129,6 +1129,52 @@ finish:
pa_log_debug("IO thread shutting down"); pa_log_debug("IO thread shutting down");
} }
static pa_bt_audio_state_t parse_state_property_change(DBusMessage *m) {
DBusMessageIter iter;
DBusMessageIter variant;
const char *key;
const char *value;
pa_bt_audio_state_t state;
if (!dbus_message_iter_init(m, &iter)) {
pa_log("Failed to parse PropertyChanged");
return PA_BT_AUDIO_STATE_INVALID;
}
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) {
pa_log("Property name not a string");
return PA_BT_AUDIO_STATE_INVALID;
}
dbus_message_iter_get_basic(&iter, &key);
if (!pa_streq(key, "State"))
return PA_BT_AUDIO_STATE_INVALID;
if (!dbus_message_iter_next(&iter)) {
pa_log("Property value missing");
return PA_BT_AUDIO_STATE_INVALID;
}
dbus_message_iter_recurse(&iter, &variant);
if (dbus_message_iter_get_arg_type(&variant) != DBUS_TYPE_STRING) {
pa_log("Property value not a string");
return PA_BT_AUDIO_STATE_INVALID;
}
dbus_message_iter_get_basic(&variant, &value);
pa_log_debug("dbus: %s property 'State' changed to value '%s'", dbus_message_get_interface(m), value);
state = pa_bt_audio_state_from_string(value);
if (state == PA_BT_AUDIO_STATE_INVALID)
pa_log("Unexpected value for property 'State': '%s'", value);
return state;
}
/* Run from main thread */ /* Run from main thread */
static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *userdata) { static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *userdata) {
DBusError err; DBusError err;
@ -1182,39 +1228,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
} }
} }
} else if (dbus_message_is_signal(m, "org.bluez.HandsfreeGateway", "PropertyChanged")) { } else if (dbus_message_is_signal(m, "org.bluez.HandsfreeGateway", "PropertyChanged")) {
const char *key; pa_bt_audio_state_t state = parse_state_property_change(m);
DBusMessageIter iter;
DBusMessageIter variant;
pa_bt_audio_state_t state = PA_BT_AUDIO_STATE_INVALID;
if (!dbus_message_iter_init(m, &iter)) {
pa_log("Failed to parse PropertyChanged: %s", err.message);
goto fail;
}
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) {
pa_log("Property name not a string.");
goto fail;
}
dbus_message_iter_get_basic(&iter, &key);
if (!dbus_message_iter_next(&iter)) {
pa_log("Property value missing");
goto fail;
}
dbus_message_iter_recurse(&iter, &variant);
if (dbus_message_iter_get_arg_type(&variant) == DBUS_TYPE_STRING) {
const char *value;
dbus_message_iter_get_basic(&variant, &value);
if (pa_streq(key, "State")) {
pa_log_debug("dbus: HSHFAG property 'State' changed to value '%s'", value);
state = pa_bt_audio_state_from_string(value);
}
}
switch(state) { switch(state) {
case PA_BT_AUDIO_STATE_INVALID: case PA_BT_AUDIO_STATE_INVALID: