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

Revert "bluetooth: Parse media transport's properties"

Browse source 
This reverts commit 2f79fb580a.

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.
This commit is contained in:
João Paulo Rechi Vita 2013-08-13 01:53:42 -03:00 • committed by Tanu Kaskinen
parent 93c3f55215
commit 133f59e86e
1 changed files with 0 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1090,24 +1090,6 @@ static int transport_parse_property(pa_bluetooth_transport *t, DBusMessageIter *
return 0; 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) { static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *userdata) {
DBusError err; DBusError err;
pa_bluetooth_discovery *y; 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); 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; 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.ObjectManager',member='InterfacesRemoved'",
"type='signal',sender='org.bluez',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'" "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'"
",arg0='org.bluez.Device1'", ",arg0='org.bluez.Device1'",
"type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'"
",arg0='org.bluez.MediaTransport1'",
NULL) < 0) { NULL) < 0) {
pa_log("Failed to add D-Bus matches: %s", err.message); pa_log("Failed to add D-Bus matches: %s", err.message);
goto fail; 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.ObjectManager',member='InterfacesRemoved'",
"type='signal',sender='org.bluez',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'" "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'"
",arg0='org.bluez.Device1'", ",arg0='org.bluez.Device1'",
"type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'"
",arg0='org.bluez.MediaTransport1'",
NULL); NULL);
if (y->filter_added) if (y->filter_added)