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: BlueZ 5 interface rename to org.bluez.Media1"

Browse source 
This reverts commit 61e8fd8854.

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:46 -03:00 • committed by Tanu Kaskinen
parent 38cc2ecbe6
commit bf46379bb6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -830,7 +830,8 @@ static void register_endpoint_reply(DBusPendingCall *pending, void *userdata) {
} }
if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) { if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) {
pa_log("RegisterEndpoint() failed: %s: %s", dbus_message_get_error_name(r), pa_dbus_get_error_message(r)); pa_log("org.bluez.Media.RegisterEndpoint() failed: %s: %s", dbus_message_get_error_name(r),
pa_dbus_get_error_message(r));
goto finish; goto finish;
} }
@ -847,11 +848,10 @@ static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const
DBusMessage *m; DBusMessage *m;
DBusMessageIter i, d; DBusMessageIter i, d;
uint8_t codec = 0; uint8_t codec = 0;
const char *interface = y->version == BLUEZ_VERSION_4 ? "org.bluez.Media" : "org.bluez.Media1";
pa_log_debug("Registering %s on adapter %s.", endpoint, path); pa_log_debug("Registering %s on adapter %s.", endpoint, path);
pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, interface, "RegisterEndpoint")); pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, "org.bluez.Media", "RegisterEndpoint"));
dbus_message_iter_init_append(m, &i); dbus_message_iter_init_append(m, &i);