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

23
spa/plugins/bluez5/bluez5-device.c
View file

@ -288,7 +288,7 @@ static void volume_changed(void *userdata)
struct spa_bt_transport_volume *t_volume;
float prev_hw_volume;
if (!node->transport)
if (!node->transport || !spa_bt_transport_volume_enabled(node->transport))
return;
/* PW is the controller for remote device. */
@ -445,7 +445,8 @@ static void dynamic_node_volume_changed(void *data)
int id = SPA_FLAG_CLEAR(node->id, DYNAMIC_NODE_ID_FLAG), volume_id;
/* Remote device is the controller */
if (!node->transport || impl->profile != DEVICE_PROFILE_AG)
if (!node->transport || impl->profile != DEVICE_PROFILE_AG
|| !spa_bt_transport_volume_enabled(node->transport))
return;
if (id == 0 || id == 2)
@ -1514,7 +1515,8 @@ static int node_set_volume(struct impl *this, struct node *node, float volumes[]
t_volume = node->transport ? &node->transport->volumes[node->id]: NULL;
if (t_volume && t_volume->active) {
if (t_volume && t_volume->active
&& spa_bt_transport_volume_enabled(node->transport)) {
float hw_volume = node_get_hw_volume(node);
spa_log_debug(this->log, "node %p hardware volume %f", node, hw_volume);
@ -1866,11 +1868,16 @@ impl_init(const struct spa_handle_factory *factory,
if (info) {
int profiles;
this->bt_dev->settings = filter_bluez_device_setting(this, info);
if ((str = spa_dict_lookup(info, "bluez5.reconnect-profiles")) != NULL)
profiles = spa_bt_profiles_from_json_array(str);
if (str == NULL || profiles < 0)
profiles = SPA_BT_PROFILE_NULL;
this->bt_dev->reconnect_profiles = profiles;
if ((str = spa_dict_lookup(info, "bluez5.reconnect-profiles")) != NULL) {
if ((profiles = spa_bt_profiles_from_json_array(str)) >= 0)
this->bt_dev->reconnect_profiles = profiles;
}
if ((str = spa_dict_lookup(info, "bluez5.hw-volume")) != NULL) {
if ((profiles = spa_bt_profiles_from_json_array(str)) >= 0)
this->bt_dev->hw_volume_profiles = profiles;
}
}
this->device.iface = SPA_INTERFACE_INIT(