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

bluetooth: Propagate to property parsers if it is initial value

Browse source 
Add a parameter so that property parsing functions distinguish the
initial case from property changes received later.
This commit is contained in:
Mikel Astiz 2013-01-29 13:10:11 +01:00 • committed by Tanu Kaskinen
parent f99e1ff2f2
commit b531422218
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -259,7 +259,7 @@ static const char *check_variant_property(DBusMessageIter *i) {
return key; return key;
} }
static int parse_manager_property(pa_bluetooth_discovery *y, DBusMessageIter *i) { static int parse_manager_property(pa_bluetooth_discovery *y, DBusMessageIter *i, bool is_property_change) {
const char *key; const char *key;
DBusMessageIter variant_i; DBusMessageIter variant_i;
@ -299,7 +299,7 @@ static int parse_manager_property(pa_bluetooth_discovery *y, DBusMessageIter *i)
return 0; return 0;
} }
static int parse_adapter_property(pa_bluetooth_discovery *y, DBusMessageIter *i) { static int parse_adapter_property(pa_bluetooth_discovery *y, DBusMessageIter *i, bool is_property_change) {
const char *key; const char *key;
DBusMessageIter variant_i; DBusMessageIter variant_i;
@ -339,7 +339,7 @@ static int parse_adapter_property(pa_bluetooth_discovery *y, DBusMessageIter *i)
return 0; return 0;
} }
static int parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i) { static int parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i, bool is_property_change) {
const char *key; const char *key;
DBusMessageIter variant_i; DBusMessageIter variant_i;
@ -487,7 +487,7 @@ static const char *transport_state_to_string(pa_bluetooth_transport_state_t stat
pa_assert_not_reached(); pa_assert_not_reached();
} }
static int parse_audio_property(pa_bluetooth_device *d, const char *interface, DBusMessageIter *i) { static int parse_audio_property(pa_bluetooth_device *d, const char *interface, DBusMessageIter *i, bool is_property_change) {
pa_bluetooth_transport *transport; pa_bluetooth_transport *transport;
const char *key; const char *key;
DBusMessageIter variant_i; DBusMessageIter variant_i;
@ -710,18 +710,18 @@ static void get_properties_reply(DBusPendingCall *pending, void *userdata) {
dbus_message_iter_recurse(&element_i, &dict_i); dbus_message_iter_recurse(&element_i, &dict_i);
if (dbus_message_has_interface(p->message, "org.bluez.Manager")) { if (dbus_message_has_interface(p->message, "org.bluez.Manager")) {
if (parse_manager_property(y, &dict_i) < 0) if (parse_manager_property(y, &dict_i, false) < 0)
goto finish; goto finish;
} else if (dbus_message_has_interface(p->message, "org.bluez.Adapter")) { } else if (dbus_message_has_interface(p->message, "org.bluez.Adapter")) {
if (parse_adapter_property(y, &dict_i) < 0) if (parse_adapter_property(y, &dict_i, false) < 0)
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(d, &dict_i) < 0) if (parse_device_property(d, &dict_i, false) < 0)
goto finish; goto finish;
} else if (parse_audio_property(d, dbus_message_get_interface(p->message), &dict_i) < 0) } else if (parse_audio_property(d, dbus_message_get_interface(p->message), &dict_i, false) < 0)
goto finish; goto finish;
} }
@ -974,10 +974,10 @@ 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(d, &arg_i) < 0) if (parse_device_property(d, &arg_i, true) < 0)
goto fail; goto fail;
} else if (parse_audio_property(d, dbus_message_get_interface(m), &arg_i) < 0) } else if (parse_audio_property(d, dbus_message_get_interface(m), &arg_i, true) < 0)
goto fail; goto fail;
if (old_any_connected != pa_bluetooth_device_any_audio_connected(d)) if (old_any_connected != pa_bluetooth_device_any_audio_connected(d))