From f0b44d0bbdfcefe458f0e06748222c925ddeca2f 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 integer 64 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 a2fa121..01a3cde 100644 --- a/src/ctl/elem-value.c +++ b/src/ctl/elem-value.c @@ -415,13 +415,11 @@ void alsactl_elem_value_set_int64(ALSACtlElemValue *self, const gint64 *values, /** * alsactl_elem_value_get_int64: * @self: A [class@ElemValue]. - * @values: (array length=value_count) (out) (transfer none): The array for 64 bit signed integer - * values. - * @value_count: The number of values up to 64. + * @values: (array fixed-size=64) (out) (transfer none): The array for 64 bit signed integer values. * * Refer to the array for [enum@ElemType].INTEGER64 element in internal storage. */ -void alsactl_elem_value_get_int64(ALSACtlElemValue *self, const gint64 **values, gsize *value_count) +void alsactl_elem_value_get_int64(ALSACtlElemValue *self, const gint64 **values) { ALSACtlElemValuePrivate *priv; struct snd_ctl_elem_value *value; @@ -430,11 +428,9 @@ void alsactl_elem_value_get_int64(ALSACtlElemValue *self, const gint64 **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; *values = (const gint64 *)value->value.integer64.value; - *value_count = G_N_ELEMENTS(value->value.integer64.value); } /** diff --git a/src/ctl/elem-value.h b/src/ctl/elem-value.h index cb9f1de..8ccaa5a 100644 --- a/src/ctl/elem-value.h +++ b/src/ctl/elem-value.h @@ -42,8 +42,7 @@ void alsactl_elem_value_get_iec60958_user_data(ALSACtlElemValue *self, const gui void alsactl_elem_value_set_int64(ALSACtlElemValue *self, const gint64 *values, gsize value_count); -void alsactl_elem_value_get_int64(ALSACtlElemValue *self, - const gint64 **values, gsize *value_count); +void alsactl_elem_value_get_int64(ALSACtlElemValue *self, const gint64 **values); gboolean alsactl_elem_value_equal(const ALSACtlElemValue *self, const ALSACtlElemValue *target); -- 2.47.3