diff options
| author | João Paulo Rechi Vita <jprvita@openbossa.org> | 2013-08-13 01:53:42 -0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-08-15 14:26:51 +0300 |
| commit | 578be3270388268878c8220010dcfec52738181c (patch) | |
| tree | 2683933a32bb52bd192b440d86ddd7f2525782de | |
| parent | c13027865ee11a0cf12d228569d2f7cad5e39bab (diff) | |
| download | pulseaudio-578be3270388268878c8220010dcfec52738181c.tar.gz | |
Revert "bluetooth: Parse media transport's properties"
This reverts commit 2f79fb580ad583b2492b567d32630e7e03883855.
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.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index 79e02c1fa..0f6150ce0 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -1090,24 +1090,6 @@ static int transport_parse_property(pa_bluetooth_transport *t, DBusMessageIter * return 0; } -static int parse_transport_properties(pa_bluetooth_transport *t, DBusMessageIter *i) { - DBusMessageIter element_i; - - dbus_message_iter_recurse(i, &element_i); - - while (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_DICT_ENTRY) { - DBusMessageIter dict_i; - - dbus_message_iter_recurse(&element_i, &dict_i); - - transport_parse_property(t, &dict_i); - - dbus_message_iter_next(&element_i); - } - - return 0; -} - static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *userdata) { DBusError err; pa_bluetooth_discovery *y; @@ -1329,13 +1311,6 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us } parse_device_properties(d, &arg_i, true); - } else if (pa_streq(interface, "org.bluez.MediaTransport1")) { - pa_bluetooth_transport *t; - - if (!(t = pa_hashmap_get(y->transports, dbus_message_get_path(m)))) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - - parse_transport_properties(t, &arg_i); } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -2000,8 +1975,6 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) { "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'", - "type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'" - ",arg0='org.bluez.MediaTransport1'", NULL) < 0) { pa_log("Failed to add D-Bus matches: %s", err.message); goto fail; @@ -2079,8 +2052,6 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) { "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'", - "type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'" - ",arg0='org.bluez.MediaTransport1'", NULL); if (y->filter_added) |