From bf46379bb60e1d42b03b420bb15f7d31434fa839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= Date: Tue, 13 Aug 2013 01:53:46 -0300 Subject: [PATCH] Revert "bluetooth: BlueZ 5 interface rename to org.bluez.Media1" 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 b161a0172..a8e841a3b 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);