mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: add property to enable hardware volume control

Browse source
This commit is contained in:
Huang-Huang Bao 2021-04-17 18:53:28 +08:00
parent 387f7e327f
commit edee633f96
No known key found for this signature in database
GPG key ID: 33C3271387A13D1B
5 changed files with 67 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -268,10 +268,19 @@ static int rfcomm_send_reply(struct spa_source *source, const char *data)
return len;
}
static bool rfcomm_volume_enabled(struct rfcomm *rfcomm)
{
return rfcomm->device != NULL
&& (rfcomm->device->hw_volume_profiles & rfcomm->profile);
}
static void rfcomm_emit_volume_changed(struct rfcomm *rfcomm, int id, int hw_volume)
{
struct spa_bt_transport_volume *t_volume;
if (!rfcomm_volume_enabled(rfcomm))
return;
if ((id == SPA_BT_VOLUME_ID_RX || id == SPA_BT_VOLUME_ID_TX) && hw_volume >= 0) {
rfcomm->volumes[id].active = true;
rfcomm->volumes[id].hw_volume = hw_volume;
@ -335,6 +344,9 @@ static bool rfcomm_send_volume_cmd(struct spa_source *source, int id)
char *cmd;
int hw_volume;
if (!rfcomm_volume_enabled(rfcomm))
return false;
t_volume = rfcomm->transport ? &rfcomm->transport->volumes[id] : NULL;
if (!(t_volume && t_volume->active))
@ -1185,10 +1197,9 @@ static int sco_set_volume_cb(void *data, int id, float volume)
char *msg;
int value;
if (!(rfcomm->profile & SPA_BT_PROFILE_HEADSET_HEAD_UNIT))
return -ENOTSUP;
if (!(rfcomm->has_volume && rfcomm->volumes[id].active))
if (!rfcomm_volume_enabled(rfcomm)
|| !(rfcomm->profile & SPA_BT_PROFILE_HEADSET_HEAD_UNIT)
|| !(rfcomm->has_volume && rfcomm->volumes[id].active))
return -ENOTSUP;
value = spa_bt_volume_linear_to_hw(volume, t_volume->hw_volume_max);
@ -1473,7 +1484,7 @@ static DBusHandlerResult profile_new_connection(DBusConnection *conn, DBusMessag
rfcomm->transport = t;
if (profile == SPA_BT_PROFILE_HSP_AG) {
rfcomm->has_volume = true;
rfcomm->has_volume = rfcomm_volume_enabled(rfcomm);
rfcomm->hs_state = hsp_hs_init1;
}
@ -1500,8 +1511,10 @@ static DBusHandlerResult profile_new_connection(DBusConnection *conn, DBusMessag
rfcomm->codec_negotiation_supported = false;
}
rfcomm->has_volume = true;
hf_features |= SPA_BT_HFP_HF_FEATURE_REMOTE_VOLUME_CONTROL;
if (rfcomm_volume_enabled(rfcomm)) {
rfcomm->has_volume = true;
hf_features |= SPA_BT_HFP_HF_FEATURE_REMOTE_VOLUME_CONTROL;
}
/* send command to AG with the features supported by Hands-Free */
cmd = spa_aprintf("AT+BRSF=%u", hf_features);