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 <o-takashi@sakamocchi.jp>

diff --git a/src/ctl/elem-value.c b/src/ctl/elem-value.c
index a2fa121fb92b9a977922db527cd938aa07038f91..01a3cde9f955078567b9a0efd27bba0fd934e918 100644 (file)
--- 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 cb9f1de28149ab85c2fd9b4ac68136f4b0fe3c69..8ccaa5a06f6b75942d810ff1f6c845040b5362d4 100644 (file)
--- 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);