mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-05 13:30:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

conf: namehint - add omit_noargs to the hint section

Browse source 
Do not list simple surround devices in the namehint function by default.

Fixes: https://github.com/alsa-project/alsa-lib/issues/27

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-03-01 19:57:06 +01:00
parent 27c7927842
commit 09e78da4ca
7 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/conf/pcm/surround21.conf
View file

@ -57,5 +57,6 @@ pcm.!surround21 {
hint { hint {
description "2.1 Surround output to Front and Subwoofer speakers" description "2.1 Surround output to Front and Subwoofer speakers"
device_output $DEV device_output $DEV
omit_noargs true
} }
} }

1
src/conf/pcm/surround40.conf
View file

@ -55,5 +55,6 @@ pcm.!surround40 {
hint { hint {
description "4.0 Surround output to Front and Rear speakers" description "4.0 Surround output to Front and Rear speakers"
device_output $DEV device_output $DEV
omit_noargs true
} }
} }

1
src/conf/pcm/surround41.conf
View file

@ -61,5 +61,6 @@ pcm.!surround41 {
hint { hint {
description "4.1 Surround output to Front, Rear and Subwoofer speakers" description "4.1 Surround output to Front, Rear and Subwoofer speakers"
device_output $DEV device_output $DEV
omit_noargs true
} }
} }

1
src/conf/pcm/surround50.conf
View file

@ -61,5 +61,6 @@ pcm.!surround50 {
hint { hint {
description "5.0 Surround output to Front, Center and Rear speakers" description "5.0 Surround output to Front, Center and Rear speakers"
device_output $DEV device_output $DEV
omit_noargs true
} }
} }

1
src/conf/pcm/surround51.conf
View file

@ -57,5 +57,6 @@ pcm.!surround51 {
hint { hint {
description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers" description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers"
device_output $DEV device_output $DEV
omit_noargs true
} }
} }

1
src/conf/pcm/surround71.conf
View file

@ -59,5 +59,6 @@ pcm.!surround71 {
hint { hint {
description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers" description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers"
device_output $DEV device_output $DEV
omit_noargs true
} }
} }

6
src/control/namehint.c
View file

@ -287,10 +287,14 @@ static int try_config(snd_config_t *config,
err = -EINVAL; err = -EINVAL;
goto __cleanup; goto __cleanup;
} }
if (list->card < 0 &&
snd_config_search(cfg, "omit_noargs", &n) >= 0 &&
snd_config_get_bool(n) > 0)
goto __skip_add;
if (level == 1 && if (level == 1 &&
snd_config_search(cfg, "show", &n) >= 0 && snd_config_search(cfg, "show", &n) >= 0 &&
snd_config_get_bool(n) <= 0) snd_config_get_bool(n) <= 0)
goto __skip_add; goto __skip_add;
if (buf1 == NULL && if (buf1 == NULL &&
snd_config_search(cfg, "description", &n) >= 0 && snd_config_search(cfg, "description", &n) >= 0 &&
snd_config_get_string(n, &str) >= 0) { snd_config_get_string(n, &str) >= 0) {