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

acp: ignore_dB should be passed around to device

Browse source 
Don't only use the ignore_dB property for the profile sets but also when
setting up the mixer of a device, like pulseaudio does.
This commit is contained in:
Wim Taymans 2022-12-06 13:39:45 +01:00
parent 2ed7afb76c
commit 80cb1d2566
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/plugins/alsa/acp/acp.c
View file

@ -1348,7 +1348,6 @@ static int device_disable(pa_card *impl, pa_alsa_mapping *mapping, pa_alsa_devic
static int device_enable(pa_card *impl, pa_alsa_mapping *mapping, pa_alsa_device *dev) static int device_enable(pa_card *impl, pa_alsa_mapping *mapping, pa_alsa_device *dev)
{ {
const char *mod_name; const char *mod_name;
bool ignore_dB = false;
uint32_t i, port_index; uint32_t i, port_index;
int res; int res;
@ -1365,7 +1364,7 @@ static int device_enable(pa_card *impl, pa_alsa_mapping *mapping, pa_alsa_device
dev->device.flags |= ACP_DEVICE_ACTIVE; dev->device.flags |= ACP_DEVICE_ACTIVE;
find_mixer(impl, dev, NULL, ignore_dB); find_mixer(impl, dev, NULL, impl->ignore_dB);
/* Synchronize priority values, as it may have changed when setting the profile */ /* Synchronize priority values, as it may have changed when setting the profile */
for (i = 0; i < impl->card.n_ports; i++) { for (i = 0; i < impl->card.n_ports; i++) {
@ -1386,7 +1385,7 @@ static int device_enable(pa_card *impl, pa_alsa_mapping *mapping, pa_alsa_device
if (dev->active_port) if (dev->active_port)
dev->active_port->port.flags |= ACP_PORT_ACTIVE; dev->active_port->port.flags |= ACP_PORT_ACTIVE;
if ((res = setup_mixer(impl, dev, ignore_dB)) < 0) if ((res = setup_mixer(impl, dev, impl->ignore_dB)) < 0)
return res; return res;
if (dev->read_volume) if (dev->read_volume)
@ -1533,7 +1532,6 @@ struct acp_card *acp_card_new(uint32_t index, const struct acp_dict *props)
struct acp_card *card; struct acp_card *card;
const char *s, *profile_set = NULL, *profile = NULL; const char *s, *profile_set = NULL, *profile = NULL;
char device_id[16]; char device_id[16];
bool ignore_dB = false;
uint32_t profile_index; uint32_t profile_index;
int res; int res;
@ -1554,6 +1552,7 @@ struct acp_card *acp_card_new(uint32_t index, const struct acp_dict *props)
impl->use_ucm = true; impl->use_ucm = true;
impl->auto_profile = true; impl->auto_profile = true;
impl->auto_port = true; impl->auto_port = true;
impl->ignore_dB = false;
if (props) { if (props) {
if ((s = acp_dict_lookup(props, "api.alsa.use-ucm")) != NULL) if ((s = acp_dict_lookup(props, "api.alsa.use-ucm")) != NULL)
@ -1561,7 +1560,7 @@ struct acp_card *acp_card_new(uint32_t index, const struct acp_dict *props)
if ((s = acp_dict_lookup(props, "api.alsa.soft-mixer")) != NULL) if ((s = acp_dict_lookup(props, "api.alsa.soft-mixer")) != NULL)
impl->soft_mixer = spa_atob(s); impl->soft_mixer = spa_atob(s);
if ((s = acp_dict_lookup(props, "api.alsa.ignore-dB")) != NULL) if ((s = acp_dict_lookup(props, "api.alsa.ignore-dB")) != NULL)
ignore_dB = spa_atob(s); impl->ignore_dB = spa_atob(s);
if ((s = acp_dict_lookup(props, "device.profile-set")) != NULL) if ((s = acp_dict_lookup(props, "device.profile-set")) != NULL)
profile_set = s; profile_set = s;
if ((s = acp_dict_lookup(props, "device.profile")) != NULL) if ((s = acp_dict_lookup(props, "device.profile")) != NULL)
@ -1609,7 +1608,7 @@ struct acp_card *acp_card_new(uint32_t index, const struct acp_dict *props)
goto error; goto error;
} }
impl->profile_set->ignore_dB = ignore_dB; impl->profile_set->ignore_dB = impl->ignore_dB;
pa_alsa_profile_set_probe(impl->profile_set, impl->ucm.mixers, pa_alsa_profile_set_probe(impl->profile_set, impl->ucm.mixers,
device_id, device_id,

1
spa/plugins/alsa/acp/card.h
View file

@ -46,6 +46,7 @@ struct pa_card {
bool soft_mixer; bool soft_mixer;
bool auto_profile; bool auto_profile;
bool auto_port; bool auto_port;
bool ignore_dB;
pa_alsa_ucm_config ucm; pa_alsa_ucm_config ucm;
pa_alsa_profile_set *profile_set; pa_alsa_profile_set *profile_set;