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

bluetooth: use helper to set multiple transport object attributes

Browse source 
For mSBC to work correctly the following must be set correctly
- codec object
- transport write method
- transport setsockopt method

Use helper method to set all three simultaneously.
Static configuration structure may be cleaner solution.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/507>
This commit is contained in:
Igor V. Kovalenko 2021-02-20 20:18:13 +03:00 • committed by PulseAudio Marge Bot
parent 62776cc815
commit 6c0c9cf845
4 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/bluetooth/backend-native.c
View file

@ -599,19 +599,16 @@ static bool hfp_rfcomm_handle(int fd, pa_bluetooth_transport *t, const char *buf
c->state = 4;
} else {
c->state = 5;
t->bt_codec = pa_bluetooth_get_hf_codec("CVSD");
t->setsockopt = NULL;
pa_bluetooth_transport_reconfigure(t, pa_bluetooth_get_hf_codec("CVSD"), sco_transport_write, NULL);
transport_put(t);
}
return false;
} else if (sscanf(buf, "AT+BCS=%d", &val)) {
if (val == 1) {
t->bt_codec = pa_bluetooth_get_hf_codec("CVSD");
t->setsockopt = NULL;
pa_bluetooth_transport_reconfigure(t, pa_bluetooth_get_hf_codec("CVSD"), sco_transport_write, NULL);
} else if (val == 2) {
t->bt_codec = pa_bluetooth_get_hf_codec("mSBC");
t->setsockopt = sco_setsockopt_enable_bt_voice;
pa_bluetooth_transport_reconfigure(t, pa_bluetooth_get_hf_codec("mSBC"), sco_transport_write, sco_setsockopt_enable_bt_voice);
} else
pa_assert_not_reached();
@ -849,8 +846,6 @@ static DBusMessage *profile_new_connection(DBusConnection *conn, DBusMessage *m,
t->acquire = sco_acquire_cb;
t->release = sco_release_cb;
t->write = sco_transport_write;
t->bt_codec = pa_bluetooth_get_hf_codec("CVSD");
t->destroy = transport_destroy;
/* If PA is the HF/HS we are in control of volume attenuation and
@ -872,6 +867,8 @@ static DBusMessage *profile_new_connection(DBusConnection *conn, DBusMessage *m,
t->set_source_volume = set_source_volume;
}
pa_bluetooth_transport_reconfigure(t, pa_bluetooth_get_hf_codec("CVSD"), sco_transport_write, NULL);
trd = pa_xnew0(struct transport_data, 1);
trd->rfcomm_fd = fd;
trd->mainloop = b->core->mainloop;