diff options
author | João Paulo Rechi Vita <jprvita@openbossa.org> | 2013-08-13 01:53:45 -0300 |
---|---|---|
committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-09-29 16:54:35 +0300 |
commit | 38cc2ecbe62b7b65ddbe50decae52ed53baebf66 (patch) | |
tree | 9fa44a11c78fa5fe0d5010fd066310f93e02fe27 /src/modules/bluetooth/bluetooth-util.c | |
parent | 4f294bcf56f19f60aec389d535ee4e2542d37383 (diff) | |
download | pulseaudio-38cc2ecbe62b7b65ddbe50decae52ed53baebf66.tar.gz |
Revert "bluetooth: BlueZ 5 interface rename to org.bluez.MediaTransport1"
This reverts commit cfb96b2530690df113e1aceb5b82fc166f9d2cfd.
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.
Diffstat (limited to 'src/modules/bluetooth/bluetooth-util.c')
-rw-r--r-- | src/modules/bluetooth/bluetooth-util.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index d5ff12fec..b161a0172 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -1302,7 +1302,6 @@ bool pa_bluetooth_device_any_audio_connected(const pa_bluetooth_device *d) { int pa_bluetooth_transport_acquire(pa_bluetooth_transport *t, bool optional, size_t *imtu, size_t *omtu) { const char *accesstype = "rw"; - const char *interface; DBusMessage *m, *r; DBusError err; int ret; @@ -1312,8 +1311,6 @@ int pa_bluetooth_transport_acquire(pa_bluetooth_transport *t, bool optional, siz pa_assert(t->device); pa_assert(t->device->discovery); - interface = t->device->discovery->version == BLUEZ_VERSION_4 ? "org.bluez.MediaTransport" : "org.bluez.MediaTransport1"; - if (optional) { /* FIXME: we are trying to acquire the transport only if the stream is playing, without actually initiating the stream request from our side @@ -1330,7 +1327,7 @@ int pa_bluetooth_transport_acquire(pa_bluetooth_transport *t, bool optional, siz dbus_error_init(&err); - pa_assert_se(m = dbus_message_new_method_call(t->owner, t->path, interface, "Acquire")); + pa_assert_se(m = dbus_message_new_method_call(t->owner, t->path, "org.bluez.MediaTransport", "Acquire")); pa_assert_se(dbus_message_append_args(m, DBUS_TYPE_STRING, &accesstype, DBUS_TYPE_INVALID)); r = dbus_connection_send_with_reply_and_block(pa_dbus_connection_get(t->device->discovery->connection), m, -1, &err); @@ -1341,7 +1338,7 @@ int pa_bluetooth_transport_acquire(pa_bluetooth_transport *t, bool optional, siz if (!dbus_message_get_args(r, &err, DBUS_TYPE_UNIX_FD, &ret, DBUS_TYPE_UINT16, &i, DBUS_TYPE_UINT16, &o, DBUS_TYPE_INVALID)) { - pa_log("Failed to parse the media transport Acquire() reply: %s", err.message); + pa_log("Failed to parse org.bluez.MediaTransport.Acquire(): %s", err.message); ret = -1; dbus_error_free(&err); goto fail; @@ -1360,7 +1357,6 @@ fail: void pa_bluetooth_transport_release(pa_bluetooth_transport *t) { const char *accesstype = "rw"; - const char *interface; DBusMessage *m; DBusError err; @@ -1368,11 +1364,9 @@ void pa_bluetooth_transport_release(pa_bluetooth_transport *t) { pa_assert(t->device); pa_assert(t->device->discovery); - interface = t->device->discovery->version == BLUEZ_VERSION_4 ? "org.bluez.MediaTransport" : "org.bluez.MediaTransport1"; - dbus_error_init(&err); - pa_assert_se(m = dbus_message_new_method_call(t->owner, t->path, interface, "Release")); + pa_assert_se(m = dbus_message_new_method_call(t->owner, t->path, "org.bluez.MediaTransport", "Release")); pa_assert_se(dbus_message_append_args(m, DBUS_TYPE_STRING, &accesstype, DBUS_TYPE_INVALID)); dbus_connection_send_with_reply_and_block(pa_dbus_connection_get(t->device->discovery->connection), m, -1, &err); |