diff options
author | Mikel Astiz <mikel.astiz@bmw-carit.de> | 2013-04-29 18:28:03 +0200 |
---|---|---|
committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2013-06-04 00:38:41 +0530 |
commit | 61e8fd8854308cb2d41e6313f25ae7131c912ea8 (patch) | |
tree | e9e0ef75dca0b3372826ca1fa3e774d7dc284ca5 /src/modules/bluetooth/bluetooth-util.c | |
parent | d22ea7ff7630bef83a3bf8c26cc56c196dec33a1 (diff) | |
download | pulseaudio-61e8fd8854308cb2d41e6313f25ae7131c912ea8.tar.gz |
bluetooth: BlueZ 5 interface rename to org.bluez.Media1
Use the new interface name if BlueZ 5 has been detected.
Diffstat (limited to 'src/modules/bluetooth/bluetooth-util.c')
-rw-r--r-- | src/modules/bluetooth/bluetooth-util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index 5d5c7abd7..ff83f53b3 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -834,8 +834,7 @@ static void register_endpoint_reply(DBusPendingCall *pending, void *userdata) { } if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) { - pa_log("org.bluez.Media.RegisterEndpoint() failed: %s: %s", dbus_message_get_error_name(r), - pa_dbus_get_error_message(r)); + pa_log("RegisterEndpoint() failed: %s: %s", dbus_message_get_error_name(r), pa_dbus_get_error_message(r)); goto finish; } @@ -852,10 +851,11 @@ 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, "org.bluez.Media", "RegisterEndpoint")); + pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, interface, "RegisterEndpoint")); dbus_message_iter_init_append(m, &i); |