commit 35ceabda237121077eae2515b52b25cd3d866eef
author Glenn Kasten <gkasten@android.com> Thu Sep 24 18:19:34 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 24 18:19:34 2020 +0000
tree 592c2cb8c3299f6b3d2eca40a9ff0194aeba0448
parent a7171cddf76ceeffbd8486873ed431aba943dda3
parent 4213b7b96b079050285ae379255490cd3734e78c

Merge "const correctness to match upstream API"

include/tinyalsa/asoundlib.h

diff --git a/include/tinyalsa/asoundlib.h b/include/tinyalsa/asoundlib.h
index 935c8d0..2ca74b2 100644
--- a/include/tinyalsa/asoundlib.h
+++ b/include/tinyalsa/asoundlib.h
@@ -164,13 +164,13 @@
                                   unsigned int flags);
 void pcm_params_free(struct pcm_params *pcm_params);
 
-struct pcm_mask *pcm_params_get_mask(struct pcm_params *pcm_params,
+struct pcm_mask *pcm_params_get_mask(const struct pcm_params *pcm_params,
                                      enum pcm_param param);
-unsigned int pcm_params_get_min(struct pcm_params *pcm_params,
+unsigned int pcm_params_get_min(const struct pcm_params *pcm_params,
                                 enum pcm_param param);
 void pcm_params_set_min(struct pcm_params *pcm_params,
                                 enum pcm_param param, unsigned int val);
-unsigned int pcm_params_get_max(struct pcm_params *pcm_params,
+unsigned int pcm_params_get_max(const struct pcm_params *pcm_params,
                                 enum pcm_param param);
 void pcm_params_set_max(struct pcm_params *pcm_params,
                                 enum pcm_param param, unsigned int val);

pcm.c

diff --git a/pcm.c b/pcm.c
index 4ae321b..735fb1d 100644
--- a/pcm.c
+++ b/pcm.c
@@ -688,7 +688,7 @@
     }
 }
 
-struct pcm_mask *pcm_params_get_mask(struct pcm_params *pcm_params,
+struct pcm_mask *pcm_params_get_mask(const struct pcm_params *pcm_params,
                                      enum pcm_param param)
 {
     int p;
@@ -705,7 +705,7 @@
     return (struct pcm_mask *)param_to_mask(params, p);
 }
 
-unsigned int pcm_params_get_min(struct pcm_params *pcm_params,
+unsigned int pcm_params_get_min(const struct pcm_params *pcm_params,
                                 enum pcm_param param)
 {
     struct snd_pcm_hw_params *params = (struct snd_pcm_hw_params *)pcm_params;
@@ -737,7 +737,7 @@
     param_set_min(params, p, val);
 }
 
-unsigned int pcm_params_get_max(struct pcm_params *pcm_params,
+unsigned int pcm_params_get_max(const struct pcm_params *pcm_params,
                                 enum pcm_param param)
 {
     struct snd_pcm_hw_params *params = (struct snd_pcm_hw_params *)pcm_params;