From: João Paulo Rechi Vita <[email protected]>
This reverts commit 61e8fd8854308cb2d41e6313f25ae7131c912ea8.
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/modules/bluetooth/bluetooth-util.c
b/src/modules/bluetooth/bluetooth-util.c
index 808b80f..de6deca 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -830,7 +830,8 @@ static void register_endpoint_reply(DBusPendingCall
*pending, void *userdata) {
}
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;
}
@@ -847,11 +848,10 @@ static void register_endpoint(pa_bluetooth_discovery *y,
const char *path, const
DBusMessage *m;
DBusMessageIter i, d;
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_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);
--
1.7.11.7
_______________________________________________
pulseaudio-discuss mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss
