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>

diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index d3e5f3ff1f1550f8d846646312d5113dddf61a51..21b869cc2b5b557d87b84a018c4a6d89074bd236 100644 (file)
--- 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 99d0d32e5b166fb69c3ba55231719f6176acc70c..3e3dbc79744e45d47cb1154bf9d617c640fc75e4 100644 (file)
--- 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;