mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-26 07:57:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pcm: softvol - add possibility to force use

Browse source 
Applications may ask to skip the softvol plugin. In some cases,
when hardware does not support any kind of the mute switch and
the PCM should be assigned to a LED group, it might be worth
to create a mute switch using softvol.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-02-22 20:54:25 +01:00
parent 2a7486c1dd
commit 1acc1c7ecc
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pcm/pcm_softvol.c
View file

@ -1130,6 +1130,7 @@ pcm.name {
[max_dB REAL] # maximal dB value (default: 0.0) [max_dB REAL] # maximal dB value (default: 0.0)
[resolution INT] # resolution (default: 256) [resolution INT] # resolution (default: 256)
# resolution = 2 means a mute switch # resolution = 2 means a mute switch
[force BOOL] # force use even if application requested to skip softvol
[led STR] # LED group (speaker or microphone) [led STR] # LED group (speaker or microphone)
} }
\endcode \endcode
@ -1170,7 +1171,7 @@ int _snd_pcm_softvol_open(snd_pcm_t **pcmp, const char *name,
int resolution = PRESET_RESOLUTION; int resolution = PRESET_RESOLUTION;
double min_dB = PRESET_MIN_DB; double min_dB = PRESET_MIN_DB;
double max_dB = ZERO_DB; double max_dB = ZERO_DB;
int card = -1, cchannels = 2; int card = -1, cchannels = 2, force = 0;
snd_ctl_led_group_t led = SND_CTL_ELEM_LED_NONE; snd_ctl_led_group_t led = SND_CTL_ELEM_LED_NONE;
const char *s; const char *s;
@ -1215,6 +1216,15 @@ int _snd_pcm_softvol_open(snd_pcm_t **pcmp, const char *name,
} }
continue; continue;
} }
if (strcmp(id, "force") == 0) {
err = snd_config_get_bool(n);
if (err < 0) {
SNDERR("Invalid force value");
return err;
}
force = err;
continue;
}
if (strcmp(id, "led") == 0) { if (strcmp(id, "led") == 0) {
err = snd_config_get_string(n, &s); err = snd_config_get_string(n, &s);
if (err < 0) { if (err < 0) {
@ -1254,7 +1264,7 @@ wrong_led_group:
SNDERR("Invalid resolution value %d", resolution); SNDERR("Invalid resolution value %d", resolution);
return -EINVAL; return -EINVAL;
} }
if (mode & SND_PCM_NO_SOFTVOL) { if ((mode & SND_PCM_NO_SOFTVOL) != 0 && !force) {
err = snd_pcm_slave_conf(root, slave, &sconf, 0); err = snd_pcm_slave_conf(root, slave, &sconf, 0);
if (err < 0) if (err < 0)
return err; return err;