summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoão Paulo Rechi Vita <jprvita@openbossa.org>2013-08-13 01:53:43 -0300
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>2013-08-15 14:28:21 +0300
commit017b41d94eadc467a5c2193dea76872f543be39b (patch)
tree03b05c1a07b3ab5d8da09d9186f0708f826d6df9
parent578be3270388268878c8220010dcfec52738181c (diff)
downloadpulseaudio-017b41d94eadc467a5c2193dea76872f543be39b.tar.gz
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.
-rw-r--r--src/modules/bluetooth/bluetooth-util.c33
1 files changed, 0 insertions, 33 deletions
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 0f6150ce0..55aecf540 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -1285,35 +1285,6 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
}
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;
}
fail:
@@ -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)