summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2022-12-13 10:31:32 +0100
committerJaroslav Kysela <perex@perex.cz>2022-12-13 10:31:35 +0100
commit9f2c68cef716aa45942b502a42d94b84289f23bc (patch)
tree4ae0cdb98e89ccec696fe23451d4d92e303a77d4
parent13e31fb1ecd5f666ffda09e87ef1aa53b4fae022 (diff)
downloadalsa-lib-9f2c68cef716aa45942b502a42d94b84289f23bc.tar.gz
pcm: route/softvol use snd_config_get_ireal vs get_real to handle also integers
Link: https://lore.kernel.org/alsa-devel/f9a7ad6a256d4ad7a31642dcf875d436@axis.com/ Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--src/pcm/pcm_route.c11
-rw-r--r--src/pcm/pcm_softvol.c4
2 files changed, 5 insertions, 10 deletions
diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index d3e5f3ff..21b869cc 100644
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -1182,15 +1182,10 @@ static int _snd_pcm_route_load_ttable(snd_config_t *tt, snd_pcm_route_ttable_ent
return -EINVAL;
}
- err = snd_config_get_real(jnode, &value);
+ err = snd_config_get_ireal(jnode, &value);
if (err < 0) {
- long v;
- err = snd_config_get_integer(jnode, &v);
- if (err < 0) {
- SNDERR("Invalid type for %s", id);
- return -EINVAL;
- }
- value = v;
+ SNDERR("Invalid type for %s", id);
+ return -EINVAL;
}
for (k = 0; (int) k < ss; k++) {
diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
index 99d0d32e..3e3dbc79 100644
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -1190,7 +1190,7 @@ int _snd_pcm_softvol_open(snd_pcm_t **pcmp, const char *name,
continue;
}
if (strcmp(id, "min_dB") == 0) {
- err = snd_config_get_real(n, &min_dB);
+ err = snd_config_get_ireal(n, &min_dB);
if (err < 0) {
SNDERR("Invalid min_dB value");
return err;
@@ -1198,7 +1198,7 @@ int _snd_pcm_softvol_open(snd_pcm_t **pcmp, const char *name,
continue;
}
if (strcmp(id, "max_dB") == 0) {
- err = snd_config_get_real(n, &max_dB);
+ err = snd_config_get_ireal(n, &max_dB);
if (err < 0) {
SNDERR("Invalid max_dB value");
return err;