ctl: elem-value: retrieve fixed-sized array by getter method for enumerated 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 <o-takashi@sakamocchi.jp>

diff --git a/src/ctl/elem-value.c b/src/ctl/elem-value.c
index 5541f1cc82d36595b17268e864a71a00079d8b4d..2d044db515f50103296ab202184b0ee3c4e27d83 100644 (file)
--- a/src/ctl/elem-value.c
+++ b/src/ctl/elem-value.c
@@ -221,13 +221,12 @@ void alsactl_elem_value_set_enum(ALSACtlElemValue *self, const guint32 *values,
 /**
  * alsactl_elem_value_get_enum:
  * @self: A [class@ElemValue].
- * @values: (array length=value_count) (out) (transfer none): The array for enumeration index
+ * @values: (array fixed-size=128) (out) (transfer none): The array for enumeration index
  *          values.
- * @value_count: The number of values up to 128.
  *
  * Refer to the array specific to [enum@ElemType].ENUMERATED element in internal storage.
  */
-void alsactl_elem_value_get_enum(ALSACtlElemValue *self, const guint32 **values, gsize *value_count)
+void alsactl_elem_value_get_enum(ALSACtlElemValue *self, const guint32 **values)
 {
     ALSACtlElemValuePrivate *priv;
     struct snd_ctl_elem_value *value;
@@ -236,11 +235,9 @@ void alsactl_elem_value_get_enum(ALSACtlElemValue *self, const guint32 **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 = value->value.enumerated.item;
-    *value_count = G_N_ELEMENTS(value->value.enumerated.item);
 }
 
 /**

diff --git a/src/ctl/elem-value.h b/src/ctl/elem-value.h
index 3207bcbdbdcefa6943c4c5869b46b6a07c09ab38..75333f54e3aadca4ec627bd0c97fc159584f3774 100644 (file)
--- a/src/ctl/elem-value.h
+++ b/src/ctl/elem-value.h
@@ -26,8 +26,7 @@ void alsactl_elem_value_get_int(ALSACtlElemValue *self, const gint32 **values);
 
 void alsactl_elem_value_set_enum(ALSACtlElemValue *self,
                                  const guint32 *values, gsize value_count);
-void alsactl_elem_value_get_enum(ALSACtlElemValue *self,
-                                 const guint32 **values, gsize *value_count);
+void alsactl_elem_value_get_enum(ALSACtlElemValue *self, const guint32 **values);
 
 void alsactl_elem_value_set_bytes(ALSACtlElemValue *self,
                                   const guint8 *values, gsize value_count);