mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: ofono: Detect if Connect has been called

Browse source 
This detects if profile has already been called and we are waiting
the response.
This commit is contained in:
Luiz Augusto von Dentz 2017-05-04 12:52:18 +02:00 • committed by Georg Chini
parent cf23f07ec7
commit f45fc03e3d
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/bluetooth/backend-ofono.c
View file

@ -65,6 +65,7 @@ struct hf_audio_card {
char *remote_address; char *remote_address;
char *local_address; char *local_address;
bool connecting;
int fd; int fd;
uint8_t codec; uint8_t codec;
@ -156,11 +157,21 @@ static int hf_audio_agent_transport_acquire(pa_bluetooth_transport *t, bool opti
pa_assert(card); pa_assert(card);
if (!optional && card->fd < 0) { if (!optional && card->fd < 0) {
DBusMessage *m; DBusMessage *m, *r;
DBusError derr;
if (card->connecting)
return -1;
card->connecting = true;
dbus_error_init(&derr);
pa_assert_se(m = dbus_message_new_method_call(t->owner, t->path, "org.ofono.HandsfreeAudioCard", "Connect")); pa_assert_se(m = dbus_message_new_method_call(t->owner, t->path, "org.ofono.HandsfreeAudioCard", "Connect"));
pa_assert_se(dbus_connection_send(pa_dbus_connection_get(card->backend->connection), m, NULL)); r = dbus_connection_send_with_reply_and_block(pa_dbus_connection_get(card->backend->connection), m, -1, &derr);
if (!r)
return -1;
if (card->connecting)
return -1; return -1;
} }
@ -533,6 +544,8 @@ static DBusMessage *hf_audio_agent_new_connection(DBusConnection *c, DBusMessage
card = pa_hashmap_get(backend->cards, path); card = pa_hashmap_get(backend->cards, path);
card->connecting = false;
if (!card || codec != HFP_AUDIO_CODEC_CVSD || card->transport->state == PA_BLUETOOTH_TRANSPORT_STATE_PLAYING) { if (!card || codec != HFP_AUDIO_CODEC_CVSD || card->transport->state == PA_BLUETOOTH_TRANSPORT_STATE_PLAYING) {
pa_log_warn("New audio connection invalid arguments (path=%s fd=%d, codec=%d)", path, fd, codec); pa_log_warn("New audio connection invalid arguments (path=%s fd=%d, codec=%d)", path, fd, codec);
pa_assert_se(r = dbus_message_new_error(m, "org.ofono.Error.InvalidArguments", "Invalid arguments in method call")); pa_assert_se(r = dbus_message_new_error(m, "org.ofono.Error.InvalidArguments", "Invalid arguments in method call"));