From 2edc3581b52985b5e074e968727af9ef588b318a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= Date: Tue, 13 Aug 2013 01:53:43 -0300 Subject: [PATCH] Revert "bluetooth: Support Properties.PropertiesChanged signal" This reverts commit 235611a7d13ab251689f5b480183d7f39e043a2e. This is part of the reversion of BlueZ 5 support so it can be added back in a separate set of modules. This makes the code easier to maintain and decrease PulseAudio's binary size. --- src/modules/bluetooth/bluetooth-util.c | 33 -------------------------- 1 file changed, 33 deletions(-) diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index 9a759aaa..ddbf6a29 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -1284,35 +1284,6 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us dbus_message_iter_next(&element_i); } - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } else if (dbus_message_is_signal(m, "org.freedesktop.DBus.Properties", "PropertiesChanged")) { - DBusMessageIter arg_i; - const char *interface; - - if (y->version != BLUEZ_VERSION_5) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; /* No reply received yet from GetManagedObjects */ - - if (!dbus_message_iter_init(m, &arg_i) || !pa_streq(dbus_message_get_signature(m), "sa{sv}as")) { - pa_log("Invalid signature found in PropertiesChanged"); - goto fail; - } - - dbus_message_iter_get_basic(&arg_i, &interface); - - pa_assert_se(dbus_message_iter_next(&arg_i)); - pa_assert(dbus_message_iter_get_arg_type(&arg_i) == DBUS_TYPE_ARRAY); - - if (pa_streq(interface, "org.bluez.Device1")) { - pa_bluetooth_device *d; - - if (!(d = pa_hashmap_get(y->devices, dbus_message_get_path(m)))) { - pa_log_warn("Property change in unknown device %s", dbus_message_get_path(m)); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - - parse_device_properties(d, &arg_i, true); - } - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -1973,8 +1944,6 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) { "type='signal',sender='org.bluez',interface='org.bluez.MediaTransport',member='PropertyChanged'", "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.ObjectManager',member='InterfacesAdded'", "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.ObjectManager',member='InterfacesRemoved'", - "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'" - ",arg0='org.bluez.Device1'", NULL) < 0) { pa_log("Failed to add D-Bus matches: %s", err.message); goto fail; @@ -2050,8 +2019,6 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) { "type='signal',sender='org.bluez',interface='org.bluez.MediaTransport',member='PropertyChanged'", "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.ObjectManager',member='InterfacesAdded'", "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.ObjectManager',member='InterfacesRemoved'", - "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'" - ",arg0='org.bluez.Device1'", NULL); if (y->filter_added) -- 2.39.2