From 7673f5fe103e792c15bb16b987b86f75b1bdb225 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Wed, 29 Jun 2022 11:49:00 +0900 Subject: [PATCH] ctl: elem-value: retrieve fixed-sized array by getter method for boolean values In UAPI of Linux sound subsystem, 'struct snd_ctl_elem_values' has fixed-sized array. It's natural to retrieve the array as is. Signed-off-by: Takashi Sakamoto --- src/ctl/elem-value.c | 8 ++------ src/ctl/elem-value.h | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/ctl/elem-value.c b/src/ctl/elem-value.c index aeb0a3c..10271fa 100644 --- a/src/ctl/elem-value.c +++ b/src/ctl/elem-value.c @@ -118,13 +118,11 @@ void alsactl_elem_value_set_bool(ALSACtlElemValue *self, const gboolean *values, /** * alsactl_elem_value_get_bool: * @self: A [class@ElemValue]. - * @values: (array length=value_count) (out) (transfer none): The array for boolean values. - * @value_count: The number of values up to 128. + * @values: (array fixed-size=128) (out) (transfer none): The array for boolean values. * * Refer to the array specific to [enum@ElemType].BOOLEAN element in internal storage. */ -void alsactl_elem_value_get_bool(ALSACtlElemValue *self, const gboolean **values, - gsize *value_count) +void alsactl_elem_value_get_bool(ALSACtlElemValue *self, const gboolean **values) { ALSACtlElemValuePrivate *priv; struct snd_ctl_elem_value *value; @@ -134,14 +132,12 @@ void alsactl_elem_value_get_bool(ALSACtlElemValue *self, const gboolean **values priv = alsactl_elem_value_get_instance_private(self); g_return_if_fail(values != NULL); - g_return_if_fail(value_count != NULL); value = &priv->value; for (i = 0; i < G_N_ELEMENTS(value->value.integer.value); ++i) priv->boolean[i] = value->value.integer.value[i] > 0; *values = priv->boolean; - *value_count = G_N_ELEMENTS(value->value.integer.value); } /** diff --git a/src/ctl/elem-value.h b/src/ctl/elem-value.h index 8d9f898..6607562 100644 --- a/src/ctl/elem-value.h +++ b/src/ctl/elem-value.h @@ -18,8 +18,7 @@ ALSACtlElemValue *alsactl_elem_value_new(); void alsactl_elem_value_set_bool(ALSACtlElemValue *self, const gboolean *values, gsize value_count); -void alsactl_elem_value_get_bool(ALSACtlElemValue *self, - const gboolean **values, gsize *value_count); +void alsactl_elem_value_get_bool(ALSACtlElemValue *self, const gboolean **values); void alsactl_elem_value_set_int(ALSACtlElemValue *self, const gint32 *values, gsize value_count); -- 2.47.3