mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: bluez: add send_with_reply() dbus helper

Browse source 
This function sends a DBusMessage on a DBusConnection
and sets the reply callback of the resulting DBusPendingCall,
as well as properly cancelling the pending call if anything fails.
This commit is contained in:
Barnabás Pőcze 2023-07-11 19:57:23 +02:00
parent 6e581deb91
commit b52d590936
7 changed files with 64 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spa/plugins/bluez5/backend-hsphfpd.c
View file

@ -890,7 +890,6 @@ static int hsphfpd_audio_acquire(void *data, bool optional)
spa_autoptr(DBusMessage) m = NULL;
const char *air_codec = HSPHFP_AIR_CODEC_CVSD;
const char *agent_codec = HSPHFP_AGENT_CODEC_PCM;
DBusPendingCall *call;
spa_log_debug(backend->log, "transport %p: Acquire %s",
transport, transport->path);
@ -911,8 +910,8 @@ static int hsphfpd_audio_acquire(void *data, bool optional)
return -ENOMEM;
dbus_message_append_args(m, DBUS_TYPE_STRING, &air_codec, DBUS_TYPE_STRING, &agent_codec, DBUS_TYPE_INVALID);
dbus_connection_send_with_reply(backend->conn, m, &call, -1);
dbus_pending_call_set_notify(call, hsphfpd_audio_acquire_reply, transport, NULL);
if (!send_with_reply(backend->conn, m, hsphfpd_audio_acquire_reply, transport))
return -EIO;
backend->acquire_in_progress = true;
@ -1250,9 +1249,8 @@ static int hsphfpd_get_endpoints(struct impl *backend)
if (m == NULL)
return -ENOMEM;
DBusPendingCall *call;
dbus_connection_send_with_reply(backend->conn, m, &call, -1);
dbus_pending_call_set_notify(call, hsphfpd_get_endpoints_reply, backend, NULL);
if (!send_with_reply(backend->conn, m, hsphfpd_get_endpoints_reply, backend))
return -EIO;
return 0;
}