From ccace933f2cb1dacee0e053018e1e9b20190e2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= Date: Tue, 13 Aug 2013 01:53:47 -0300 Subject: [PATCH] Revert "bluetooth: BlueZ 5 interface rename to org.bluez.MediaEndpoint1" This reverts commit d22ea7ff7630bef83a3bf8c26cc56c196dec33a1. 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 | 51 +++++++------------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index a8e841a3b..978d6d4e8 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -61,30 +61,6 @@ " " \ "" -#define MEDIA_ENDPOINT_1_INTROSPECT_XML \ - DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \ - "" \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - " " \ - "" - typedef enum pa_bluez_version { BLUEZ_VERSION_UNKNOWN, BLUEZ_VERSION_4, @@ -1473,7 +1449,7 @@ static DBusMessage *endpoint_set_configuration(DBusConnection *conn, DBusMessage dbus_message_iter_get_basic(&args, &path); if (pa_hashmap_get(y->transports, path)) { - pa_log("Endpoint SetConfiguration: Transport %s is already configured.", path); + pa_log("org.bluez.MediaEndpoint.SetConfiguration: Transport %s is already configured.", path); goto fail2; } @@ -1567,10 +1543,11 @@ static DBusMessage *endpoint_set_configuration(DBusConnection *conn, DBusMessage return NULL; fail: - pa_log("Endpoint SetConfiguration: invalid arguments"); + pa_log("org.bluez.MediaEndpoint.SetConfiguration: invalid arguments"); fail2: - pa_assert_se(r = dbus_message_new_error(m, "org.bluez.Error.InvalidArguments", "Unable to set configuration")); + pa_assert_se(r = dbus_message_new_error(m, "org.bluez.MediaEndpoint.Error.InvalidArguments", + "Unable to set configuration")); return r; } @@ -1584,7 +1561,7 @@ static DBusMessage *endpoint_clear_configuration(DBusConnection *c, DBusMessage dbus_error_init(&e); if (!dbus_message_get_args(m, &e, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { - pa_log("Endpoint ClearConfiguration: %s", e.message); + pa_log("org.bluez.MediaEndpoint.ClearConfiguration: %s", e.message); dbus_error_free(&e); goto fail; } @@ -1609,7 +1586,8 @@ static DBusMessage *endpoint_clear_configuration(DBusConnection *c, DBusMessage return r; fail: - pa_assert_se(r = dbus_message_new_error(m, "org.bluez.Error.InvalidArguments", "Unable to clear configuration")); + pa_assert_se(r = dbus_message_new_error(m, "org.bluez.MediaEndpoint.Error.InvalidArguments", + "Unable to clear configuration")); return r; } @@ -1679,7 +1657,7 @@ static DBusMessage *endpoint_select_configuration(DBusConnection *c, DBusMessage dbus_error_init(&e); if (!dbus_message_get_args(m, &e, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &cap, &size, DBUS_TYPE_INVALID)) { - pa_log("Endpoint SelectConfiguration: %s", e.message); + pa_log("org.bluez.MediaEndpoint.SelectConfiguration: %s", e.message); dbus_error_free(&e); goto fail; } @@ -1776,7 +1754,8 @@ done: return r; fail: - pa_assert_se(r = dbus_message_new_error(m, "org.bluez.Error.InvalidArguments", "Unable to select configuration")); + pa_assert_se(r = dbus_message_new_error(m, "org.bluez.MediaEndpoint.Error.InvalidArguments", + "Unable to select configuration")); return r; } @@ -1800,19 +1779,17 @@ static DBusHandlerResult endpoint_handler(DBusConnection *c, DBusMessage *m, voi !pa_streq(path, HFP_HS_ENDPOINT)) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - interface = y->version == BLUEZ_VERSION_4 ? "org.bluez.MediaEndpoint" : "org.bluez.MediaEndpoint1"; - if (dbus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) { - const char *xml = y->version == BLUEZ_VERSION_4 ? ENDPOINT_INTROSPECT_XML : MEDIA_ENDPOINT_1_INTROSPECT_XML; + const char *xml = ENDPOINT_INTROSPECT_XML; pa_assert_se(r = dbus_message_new_method_return(m)); pa_assert_se(dbus_message_append_args(r, DBUS_TYPE_STRING, &xml, DBUS_TYPE_INVALID)); - } else if (dbus_message_is_method_call(m, interface, "SetConfiguration")) + } else if (dbus_message_is_method_call(m, "org.bluez.MediaEndpoint", "SetConfiguration")) r = endpoint_set_configuration(c, m, userdata); - else if (dbus_message_is_method_call(m, interface, "SelectConfiguration")) + else if (dbus_message_is_method_call(m, "org.bluez.MediaEndpoint", "SelectConfiguration")) r = endpoint_select_configuration(c, m, userdata); - else if (dbus_message_is_method_call(m, interface, "ClearConfiguration")) + else if (dbus_message_is_method_call(m, "org.bluez.MediaEndpoint", "ClearConfiguration")) r = endpoint_clear_configuration(c, m, userdata); else return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;