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

bluez5: backend-native: fallthrough to report volume instead of duplicating code

Browse source
This commit is contained in:
George Kiagiadakis 2024-10-17 11:37:54 +03:00 • committed by Wim Taymans
parent bd5de6eb1c
commit dc5b85fe57
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spa/plugins/bluez5/backend-native.c
View file

@ -2114,6 +2114,7 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* token)
case hfp_hf_ccwa: case hfp_hf_ccwa:
rfcomm->hf_state = hfp_hf_slc1; rfcomm->hf_state = hfp_hf_slc1;
rfcomm->slc_configured = true; rfcomm->slc_configured = true;
if (!rfcomm->codec_negotiation_supported) { if (!rfcomm->codec_negotiation_supported) {
if (rfcomm_new_transport(rfcomm) < 0) { if (rfcomm_new_transport(rfcomm) < 0) {
// TODO: We should manage the missing transport // TODO: We should manage the missing transport
@ -2122,15 +2123,14 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* token)
spa_bt_device_connect_profile(rfcomm->device, rfcomm->profile); spa_bt_device_connect_profile(rfcomm->device, rfcomm->profile);
} }
} }
/* Report volume on SLC establishment */
if (rfcomm_send_volume_cmd(rfcomm, SPA_BT_VOLUME_ID_RX))
rfcomm->hf_state = hfp_hf_vgs;
rfcomm->telephony_ag = telephony_ag_new(backend->telephony, sizeof(struct spa_hook)); rfcomm->telephony_ag = telephony_ag_new(backend->telephony, sizeof(struct spa_hook));
telephony_ag_add_listener(rfcomm->telephony_ag, telephony_ag_get_user_data(rfcomm->telephony_ag), telephony_ag_add_listener(rfcomm->telephony_ag, telephony_ag_get_user_data(rfcomm->telephony_ag),
&telephony_ag_events, rfcomm); &telephony_ag_events, rfcomm);
telephony_ag_register(rfcomm->telephony_ag); telephony_ag_register(rfcomm->telephony_ag);
break;
/* Report volume on SLC establishment */
SPA_FALLTHROUGH;
case hfp_hf_slc2: case hfp_hf_slc2:
if (rfcomm_send_volume_cmd(rfcomm, SPA_BT_VOLUME_ID_RX)) if (rfcomm_send_volume_cmd(rfcomm, SPA_BT_VOLUME_ID_RX))
rfcomm->hf_state = hfp_hf_vgs; rfcomm->hf_state = hfp_hf_vgs;