From: João Paulo Rechi Vita <[email protected]>
Parse the arguments of the InterfacesAdded signal and the
GetManagedObjects() reply.
This code is based on previous work by Mikel Astiz.
---
src/modules/bluetooth/bluez5-util.c | 51 +++++++++++++++++++++++++++++++++++--
1 file changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/modules/bluetooth/bluez5-util.c
b/src/modules/bluetooth/bluez5-util.c
index 24211ea..f8219ea 100644
--- a/src/modules/bluetooth/bluez5-util.c
+++ b/src/modules/bluetooth/bluez5-util.c
@@ -38,6 +38,7 @@
#include "bluez5-util.h"
#define BLUEZ_SERVICE "org.bluez"
+#define BLUEZ_ADAPTER_INTERFACE BLUEZ_SERVICE ".Adapter1"
#define BLUEZ_DEVICE_INTERFACE BLUEZ_SERVICE ".Device1"
#define BLUEZ_MEDIA_ENDPOINT_INTERFACE BLUEZ_SERVICE ".MediaEndpoint1"
#define BLUEZ_MEDIA_TRANSPORT_INTERFACE BLUEZ_SERVICE ".MediaTransport1"
@@ -315,6 +316,52 @@ static void
pa_bluetooth_discovery_remove_all_devices(pa_bluetooth_discovery *y)
}
}
+static void parse_interfaces_and_properties(pa_bluetooth_discovery *y,
DBusMessageIter *dict_i) {
+ DBusMessageIter element_i;
+ const char *path;
+
+ pa_assert(dbus_message_iter_get_arg_type(dict_i) == DBUS_TYPE_OBJECT_PATH);
+ dbus_message_iter_get_basic(dict_i, &path);
+
+ pa_assert_se(dbus_message_iter_next(dict_i));
+ pa_assert(dbus_message_iter_get_arg_type(dict_i) == DBUS_TYPE_ARRAY);
+
+ dbus_message_iter_recurse(dict_i, &element_i);
+
+ while (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_DICT_ENTRY)
{
+ DBusMessageIter iface_i;
+ const char *interface;
+
+ dbus_message_iter_recurse(&element_i, &iface_i);
+
+ pa_assert(dbus_message_iter_get_arg_type(&iface_i) ==
DBUS_TYPE_STRING);
+ dbus_message_iter_get_basic(&iface_i, &interface);
+
+ pa_assert_se(dbus_message_iter_next(&iface_i));
+ pa_assert(dbus_message_iter_get_arg_type(&iface_i) == DBUS_TYPE_ARRAY);
+
+ if (pa_streq(interface, BLUEZ_ADAPTER_INTERFACE)) {
+ pa_log_debug("Adapter %s found", path);
+ /* TODO: register endpoints with adapter */
+ } else if (pa_streq(interface, BLUEZ_DEVICE_INTERFACE)) {
+ if (pa_bluetooth_discovery_get_device_by_path(y, path)) {
+ pa_log_error("Found duplicated D-Bus path for device %s",
path);
+ return;
+ }
+
+ pa_log_debug("Device %s found", path);
+
+ pa_bluetooth_discovery_create_device(y, path);
+ /* TODO: parse device properties */
+ } else
+ pa_log_debug("Unknown interface %s found, skipping", interface);
+
+ dbus_message_iter_next(&element_i);
+ }
+
+ return;
+}
+
static void get_managed_objects_reply(DBusPendingCall *pending, void
*userdata) {
pa_dbus_pending *p;
pa_bluetooth_discovery *y;
@@ -346,7 +393,7 @@ static void get_managed_objects_reply(DBusPendingCall
*pending, void *userdata)
dbus_message_iter_recurse(&element_i, &dict_i);
- /* TODO: parse interfaces and properties */
+ parse_interfaces_and_properties(y, &dict_i);
dbus_message_iter_next(&element_i);
}
@@ -431,7 +478,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus,
DBusMessage *m, void *us
goto fail;
}
- /* TODO: parse interfaces and properties */
+ parse_interfaces_and_properties(y, &arg_i);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} else if (dbus_message_is_signal(m, "org.freedesktop.DBus.ObjectManager",
"InterfacesRemoved")) {
--
1.7.11.7
_______________________________________________
pulseaudio-discuss mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss
