]> git.alsa-project.org Git - alsa-gobject.git/commitdiff
ctl: elem-info: remove unused classes
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Thu, 2 Jun 2022 09:26:26 +0000 (18:26 +0900)
committer坂本 貴史 <o-takashi@sakamocchi.jp>
Thu, 2 Jun 2022 09:32:52 +0000 (18:32 +0900)
Some gobject classes are now unused. This commit deletes them.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
src/ctl/alsactl.h
src/ctl/alsactl.map
src/ctl/elem-info.c [deleted file]
src/ctl/elem-info.h [deleted file]
src/ctl/meson.build
src/ctl/privates.h
tests/alsactl-elem-info [deleted file]
tests/meson.build

index 865c3b07f96b4d72197dd4e78da69fe2583ff2cf..48b8584acef6724c6446f47dd8f45d3b0f89ecb6 100644 (file)
@@ -18,7 +18,6 @@
 #include <elem-info-single-array.h>
 
 #include <card-info.h>
-#include <elem-info.h>
 #include <elem-info-iec60958.h>
 #include <elem-info-boolean.h>
 #include <elem-info-bytes.h>
index 86020921a09b46fa8dbe412b5dceb921996ef36b..70c69a4fb32717142014870a153745bbb91df010 100644 (file)
@@ -22,9 +22,6 @@ ALSA_GOBJECT_0_0_0 {
     "alsactl_elem_id_get_index";
     "alsactl_elem_id_equal";
 
-    "alsactl_elem_info_get_type";
-    "alsactl_elem_info_new";
-
     "alsactl_elem_value_get_type";
     "alsactl_elem_value_new";
     "alsactl_elem_value_set_bool";
@@ -75,13 +72,6 @@ ALSA_GOBJECT_0_3_0 {
     "alsactl_card_read_elem_value";
     "alsactl_card_create_source";
 
-    "alsactl_elem_info_get_int_data";
-    "alsactl_elem_info_set_int_data";
-    "alsactl_elem_info_get_int64_data";
-    "alsactl_elem_info_set_int64_data";
-    "alsactl_elem_info_get_enum_data";
-    "alsactl_elem_info_set_enum_data";
-
     "alsactl_elem_info_common_get_type";
 
     "alsactl_elem_info_iec60958_get_type";
diff --git a/src/ctl/elem-info.c b/src/ctl/elem-info.c
deleted file mode 100644 (file)
index bfe8829..0000000
+++ /dev/null
@@ -1,379 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-later
-#include "privates.h"
-
-#include <errno.h>
-
-/**
- * ALSACtlElemInfo:
- * An GObject-derived object to represent the information of any type of element.
- *
- * A [class@ElemInfo] is an GObject-derived object to represent the information of any type of
- * element.
- *
- * The object wraps `struct snd_ctl_elem_info` in UAPI of Linux sound subsystem.
- */
-typedef struct {
-    struct snd_ctl_elem_info info;
-
-    struct {
-        gint32 min;
-        gint32 max;
-        gint32 step;
-    } int_data;
-    gchar **enum_data;
-} ALSACtlElemInfoPrivate;
-G_DEFINE_TYPE_WITH_PRIVATE(ALSACtlElemInfo, alsactl_elem_info, G_TYPE_OBJECT)
-
-enum ctl_elem_info_prop_type {
-    CTL_ELEM_INFO_PROP_ELEM_ID = 1,
-    CTL_ELEM_INFO_PROP_TYPE,
-    CTL_ELEM_INFO_PROP_ACCESS,
-    CTL_ELEM_INFO_PROP_OWNER,
-    CTL_ELEM_INFO_PROP_VALUE_COUNT,
-    CTL_ELEM_INFO_PROP_COUNT,
-};
-static GParamSpec *ctl_elem_info_props[CTL_ELEM_INFO_PROP_COUNT] = { NULL, };
-
-static void ctl_elem_info_set_property(GObject *obj, guint id,
-                                       const GValue *val, GParamSpec *spec)
-{
-    ALSACtlElemInfo *self = ALSACTL_ELEM_INFO(obj);
-    ALSACtlElemInfoPrivate *priv = alsactl_elem_info_get_instance_private(self);
-
-    switch (id) {
-    case CTL_ELEM_INFO_PROP_TYPE:
-        priv->info.type = (ALSACtlElemType)g_value_get_enum(val);
-        break;
-    case CTL_ELEM_INFO_PROP_ACCESS:
-        priv->info.access = (ALSACtlElemAccessFlag)g_value_get_flags(val);
-        break;
-    case CTL_ELEM_INFO_PROP_OWNER:
-        priv->info.owner = g_value_get_int(val);
-        break;
-    case CTL_ELEM_INFO_PROP_VALUE_COUNT:
-        priv->info.count = g_value_get_uint(val);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec);
-        break;
-    }
-}
-
-static void ctl_elem_info_get_property(GObject *obj, guint id, GValue *val,
-                                       GParamSpec *spec)
-{
-    ALSACtlElemInfo *self = ALSACTL_ELEM_INFO(obj);
-    ALSACtlElemInfoPrivate *priv = alsactl_elem_info_get_instance_private(self);
-
-    switch (id) {
-    case CTL_ELEM_INFO_PROP_ELEM_ID:
-        g_value_set_static_boxed(val, (const ALSACtlElemId* )&priv->info.id);
-        break;
-    case CTL_ELEM_INFO_PROP_TYPE:
-        g_value_set_enum(val, (ALSACtlElemType)priv->info.type);
-        break;
-    case CTL_ELEM_INFO_PROP_ACCESS:
-        g_value_set_flags(val, priv->info.access);
-        break;
-    case CTL_ELEM_INFO_PROP_OWNER:
-        g_value_set_int(val, priv->info.owner);
-        break;
-    case CTL_ELEM_INFO_PROP_VALUE_COUNT:
-        g_value_set_uint(val, priv->info.count);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec);
-        break;
-    }
-}
-
-static void ctl_elem_info_finalize(GObject *obj)
-{
-    ALSACtlElemInfo *self = ALSACTL_ELEM_INFO(obj);
-    ALSACtlElemInfoPrivate *priv = alsactl_elem_info_get_instance_private(self);
-
-    g_strfreev(priv->enum_data);
-
-    G_OBJECT_CLASS(alsactl_elem_info_parent_class)->finalize(obj);
-}
-
-static void alsactl_elem_info_class_init(ALSACtlElemInfoClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
-
-    gobject_class->set_property = ctl_elem_info_set_property;
-    gobject_class->get_property = ctl_elem_info_get_property;
-    gobject_class->finalize = ctl_elem_info_finalize;
-
-    ctl_elem_info_props[CTL_ELEM_INFO_PROP_ELEM_ID] =
-        g_param_spec_boxed("elem-id", "elem-id",
-                           "The identifier of the element, one of ALSACtlElemId",
-                           ALSACTL_TYPE_ELEM_ID,
-                           G_PARAM_READABLE);
-
-    ctl_elem_info_props[CTL_ELEM_INFO_PROP_TYPE] =
-        g_param_spec_enum("type", "type",
-                          "The type for this element, one of ALSACtlElemType",
-                          ALSACTL_TYPE_ELEM_TYPE,
-                          ALSACTL_ELEM_TYPE_NONE,
-                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
-    ctl_elem_info_props[CTL_ELEM_INFO_PROP_ACCESS] =
-        g_param_spec_flags("access", "access",
-                           "The access permission for this element with "
-                           "flags of ALSACtlElemAccessFlag.",
-                           ALSACTL_TYPE_ELEM_ACCESS_FLAG,
-                           ALSACTL_ELEM_ACCESS_FLAG_READ,
-                           G_PARAM_READWRITE);
-
-    ctl_elem_info_props[CTL_ELEM_INFO_PROP_OWNER] =
-        g_param_spec_int("owner", "owner",
-                         "The value of PID for process to own the element",
-                         G_MININT, G_MAXINT,
-                         -1,
-                         G_PARAM_READABLE);
-
-    ctl_elem_info_props[CTL_ELEM_INFO_PROP_VALUE_COUNT] =
-        g_param_spec_uint("value-count", "value-count",
-                          "The number of members as value of this element",
-                          0, G_MAXUINT,
-                          0,
-                          G_PARAM_READWRITE);
-
-    g_object_class_install_properties(gobject_class, CTL_ELEM_INFO_PROP_COUNT,
-                                      ctl_elem_info_props);
-}
-
-static void alsactl_elem_info_init(ALSACtlElemInfo *self)
-{
-    ALSACtlElemInfoPrivate *priv = alsactl_elem_info_get_instance_private(self);
-
-    priv->enum_data = NULL;
-}
-
-/**
- * alsactl_elem_info_new:
- * @elem_type: The type of element, one of [enum@ElemType].
- * @error: A [struct@GLib.Error].
- *
- * Allocate and return the instance of [class@ElemInfo].
- *
- * Returns: An instance of [class@ElemInfo].
- */
-ALSACtlElemInfo *alsactl_elem_info_new(ALSACtlElemType elem_type, GError **error)
-{
-    g_return_val_if_fail(error == NULL || *error == NULL, NULL);
-
-    switch (elem_type) {
-    case ALSACTL_ELEM_TYPE_BOOLEAN:
-    case ALSACTL_ELEM_TYPE_INTEGER:
-    case ALSACTL_ELEM_TYPE_ENUMERATED:
-    case ALSACTL_ELEM_TYPE_BYTES:
-    case ALSACTL_ELEM_TYPE_IEC60958:
-    case ALSACTL_ELEM_TYPE_INTEGER64:
-        break;
-    default:
-        g_return_val_if_reached(NULL);
-    }
-
-    return g_object_new(ALSACTL_TYPE_ELEM_INFO, "type", elem_type, NULL);
-}
-
-/**
- * alsactl_elem_info_get_int_data:
- * @self: A [class@ElemInfo].
- * @data: (array fixed-size=3)(out)(transfer none): The array with elements for the data of integer
- *        element; minimum value, maximum value, and value step in the order.
- * @error: A [struct@GLib.Error].
- *
- * Refer to the array with elements for the data of integer element; minimum value, maximum value,
- * and value step in the order. The call of function is successful as long as the information is
- * for integer type.
- *
- * Returns: %TRUE when the overall operation finishes successfully, else %FALSE.
- */
-gboolean alsactl_elem_info_get_int_data(ALSACtlElemInfo *self, const gint32 *data[3], GError **error)
-{
-    ALSACtlElemInfoPrivate *priv;
-
-    g_return_val_if_fail(ALSACTL_IS_ELEM_INFO(self), FALSE);
-    priv = alsactl_elem_info_get_instance_private(self);
-
-    g_return_val_if_fail(data != NULL, FALSE);
-    g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
-
-    g_return_val_if_fail(priv->info.type == SNDRV_CTL_ELEM_TYPE_INTEGER, FALSE);
-
-    priv->int_data.min = (gint32)priv->info.value.integer.min;
-    priv->int_data.max = (gint32)priv->info.value.integer.max;
-    priv->int_data.step = (gint32)priv->info.value.integer.step;
-
-    *data = (const gint32 *)&priv->int_data;
-
-    return TRUE;
-}
-
-/**
- * alsactl_elem_info_set_int_data:
- * @self: A [class@ElemInfo].
- * @data: (array fixed-size=3)(transfer none): The array with elements for the data of integer
- *        element; minimum value, maximum value, and value step in the order.
- * @error: A [struct@GLib.Error].
- *
- * Get the array with elements for the data of integer element; minimum value, maximum value, and
- * value step in the order. The call of function is successful as long as the information is for
- * integer type.
- *
- * Returns: %TRUE when the overall operation finishes successfully, else %FALSE.
- */
-gboolean alsactl_elem_info_set_int_data(ALSACtlElemInfo *self, const gint32 data[3], GError **error)
-{
-    ALSACtlElemInfoPrivate *priv;
-
-    g_return_val_if_fail(ALSACTL_IS_ELEM_INFO(self), FALSE);
-    priv = alsactl_elem_info_get_instance_private(self);
-
-    g_return_val_if_fail(data != NULL, FALSE);
-    g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
-
-    g_return_val_if_fail(priv->info.type == SNDRV_CTL_ELEM_TYPE_INTEGER, FALSE);
-
-    priv->info.value.integer.min = (long)data[0];
-    priv->info.value.integer.max = (long)data[1];
-    priv->info.value.integer.step = (long)data[2];
-
-    return TRUE;
-}
-
-/**
- * alsactl_elem_info_get_int64_data:
- * @self: A [class@ElemInfo].
- * @data: (array fixed-size=3)(out)(transfer none): The array with elements for the data of
- *        integer64 element; minimum value, maximum value, and value step in the order.
- * @error: A [struct@GLib.Error].
- *
- * Refer to the array with elements for the data of integer64 element; minimum value, maximum
- * value, and value step in the order. The call of function is successful as long as the
- * information is for integer64 type.
- *
- * Returns: %TRUE when the overall operation finishes successfully, else %FALSE.
- */
-gboolean alsactl_elem_info_get_int64_data(ALSACtlElemInfo *self, const gint64 *data[3], GError **error)
-{
-    ALSACtlElemInfoPrivate *priv;
-
-    g_return_val_if_fail(ALSACTL_IS_ELEM_INFO(self), FALSE);
-    priv = alsactl_elem_info_get_instance_private(self);
-
-    g_return_val_if_fail(data != NULL, FALSE);
-    g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
-
-    g_return_val_if_fail(priv->info.type == SNDRV_CTL_ELEM_TYPE_INTEGER64, FALSE);
-
-    priv->int_data.min = (gint64)priv->info.value.integer.min;
-    priv->int_data.max = (gint64)priv->info.value.integer.max;
-    priv->int_data.step = (gint64)priv->info.value.integer.step;
-
-    *data = (const gint64 *)&priv->info.value.integer64;
-
-    return TRUE;
-}
-
-/**
- * alsactl_elem_info_set_int64_data:
- * @self: A [class@ElemInfo].
- * @data: (array fixed-size=3)(transfer none): The array with elements for the data of integer64
- *        element; minimum value, maximum value, and value step in the order.
- * @error: A [struct@GLib.Error].
- *
- * Get the array with elements for the data of integer64 element; minimum value, maximum value, and
- * value step in the order. The call of function is successful as long as the information is for
- * integer64 type.
- *
- * Returns: %TRUE when the overall operation finishes successfully, else %FALSE.
- */
-gboolean alsactl_elem_info_set_int64_data(ALSACtlElemInfo *self, const gint64 data[3], GError **error)
-{
-    ALSACtlElemInfoPrivate *priv;
-
-    g_return_val_if_fail(ALSACTL_IS_ELEM_INFO(self), FALSE);
-    priv = alsactl_elem_info_get_instance_private(self);
-
-    g_return_val_if_fail(data != NULL, FALSE);
-    g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
-
-    g_return_val_if_fail(priv->info.type == SNDRV_CTL_ELEM_TYPE_INTEGER64, FALSE);
-
-    priv->info.value.integer.min = (long long)data[0];
-    priv->info.value.integer.max = (long long)data[1];
-    priv->info.value.integer.step = (long long)data[2];
-
-    return TRUE;
-}
-
-/**
- * alsactl_elem_info_get_enum_data:
- * @self: A [class@ElemInfo].
- * @data: (array zero-terminated=1)(out)(transfer none): The array with elements for the label
- *        entries of enumerated element.
- * @error: A [struct@GLib.Error].
- *
- * Refer to the array with elements for the label entries of enumerated element in internal storage.
- * The call of function is successful as long as the information is for enumerated type.
- *
- * Returns: %TRUE when the overall operation finishes successfully, else %FALSE.
- */
-gboolean alsactl_elem_info_get_enum_data(ALSACtlElemInfo *self, const gchar ***data, GError **error)
-{
-    ALSACtlElemInfoPrivate *priv;
-
-    g_return_val_if_fail(ALSACTL_IS_ELEM_INFO(self), FALSE);
-    priv = alsactl_elem_info_get_instance_private(self);
-
-    g_return_val_if_fail(data != NULL, FALSE);
-    g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
-
-    g_return_val_if_fail(priv->info.type == SNDRV_CTL_ELEM_TYPE_ENUMERATED, FALSE);
-
-    *data = (const gchar **)priv->enum_data;
-
-    return TRUE;
-}
-
-/**
- * alsactl_elem_info_set_enum_data:
- * @self: A [class@ElemInfo].
- * @data: (array zero-terminated=1): The array with elements for the label entries of enumerated
- *        element.
- * @error: A [struct@GLib.Error].
- *
- * Copy the array with elements for the label entries of enumerated element into internal storage.
- * The call of function is successful as long as the information is for enumerated type.
- *
- * Returns: %TRUE when the overall operation finishes successfully, else %FALSE.
- */
-gboolean alsactl_elem_info_set_enum_data(ALSACtlElemInfo *self, const gchar **data, GError **error)
-{
-    ALSACtlElemInfoPrivate *priv;
-
-    g_return_val_if_fail(ALSACTL_IS_ELEM_INFO(self), FALSE);
-    priv = alsactl_elem_info_get_instance_private(self);
-
-    g_return_val_if_fail(data != NULL, FALSE);
-    g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
-
-    g_return_val_if_fail(priv->info.type == SNDRV_CTL_ELEM_TYPE_ENUMERATED, FALSE);
-
-    g_strfreev(priv->enum_data);
-
-    priv->enum_data = g_strdupv((gchar **)data);
-
-    return TRUE;
-}
-
-void ctl_elem_info_refer_private(ALSACtlElemInfo *self, struct snd_ctl_elem_info **info)
-{
-    ALSACtlElemInfoPrivate *priv = alsactl_elem_info_get_instance_private(self);
-
-    *info = &priv->info;
-}
diff --git a/src/ctl/elem-info.h b/src/ctl/elem-info.h
deleted file mode 100644 (file)
index a9c2194..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-later
-#ifndef __ALSA_GOBJECT_ALSACTL_ELEM_INFO_H__
-#define __ALSA_GOBJECT_ALSACTL_ELEM_INFO_H__
-
-#include <alsactl.h>
-
-G_BEGIN_DECLS
-
-#define ALSACTL_TYPE_ELEM_INFO      (alsactl_elem_info_get_type())
-
-G_DECLARE_DERIVABLE_TYPE(ALSACtlElemInfo, alsactl_elem_info, ALSACTL, ELEM_INFO, GObject);
-
-struct _ALSACtlElemInfoClass {
-    GObjectClass parent_class;
-};
-
-ALSACtlElemInfo *alsactl_elem_info_new(ALSACtlElemType elem_type, GError **error);
-
-gboolean alsactl_elem_info_get_int_data(ALSACtlElemInfo *self, const gint32 *data[3], GError **error);
-gboolean alsactl_elem_info_set_int_data(ALSACtlElemInfo *self, const gint32 data[3], GError **error);
-
-gboolean alsactl_elem_info_get_int64_data(ALSACtlElemInfo *self, const gint64 *data[3], GError **error);
-gboolean alsactl_elem_info_set_int64_data(ALSACtlElemInfo *self, const gint64 data[3], GError **error);
-
-gboolean alsactl_elem_info_get_enum_data(ALSACtlElemInfo *self, const gchar ***data, GError **error);
-gboolean alsactl_elem_info_set_enum_data(ALSACtlElemInfo *self, const gchar **data, GError **error);
-
-G_END_DECLS
-
-#endif
index c35480f48965f726a303e174cc8e4c8a35afef2e..2102d178e498d12a18ead893cdba314885d6abe2 100644 (file)
@@ -13,7 +13,6 @@ sources = files(
   'card.c',
   'card-info.c',
   'elem-id.c',
-  'elem-info.c',
   'elem-value.c',
   'elem-info-common.c',
   'elem-info-iec60958.c',
@@ -30,7 +29,6 @@ headers = files(
   'card.h',
   'card-info.h',
   'elem-id.h',
-  'elem-info.h',
   'elem-value.h',
   'elem-info-common.h',
   'elem-info-iec60958.h',
index 5a14f06730d92a70f09cf1125aefeca02e58170a..a3c2dcb580ac14fd72ec5dcc2afc6b91899359d5 100644 (file)
@@ -9,9 +9,6 @@ G_BEGIN_DECLS
 void ctl_card_info_refer_private(ALSACtlCardInfo *self,
                                  struct snd_ctl_card_info **info);
 
-void ctl_elem_info_refer_private(ALSACtlElemInfo *self,
-                                 struct snd_ctl_elem_info **info);
-
 void ctl_elem_info_boolean_refer_private(ALSACtlElemInfoBoolean *self,
                                          struct snd_ctl_elem_info **data);
 
diff --git a/tests/alsactl-elem-info b/tests/alsactl-elem-info
deleted file mode 100644 (file)
index 98fe16b..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env python3
-
-from sys import exit
-from errno import ENXIO
-
-from helper import test
-
-import gi
-gi.require_version('ALSACtl', '0.0')
-from gi.repository import ALSACtl
-
-target = ALSACtl.ElemInfo
-props = (
-    'elem-id',
-    'type',
-    'access',
-    'owner',
-    'value-count',
-)
-methods = (
-    'new',
-    'get_int_data',
-    'set_int_data',
-    'get_int64_data',
-    'set_int64_data',
-    'get_enum_data',
-    'set_enum_data',
-)
-signals = ()
-
-if not test(target, props, methods, signals):
-    exit(ENXIO)
index 48dc6046763f73e62c750fb4489044c6052cbb67..f427f0afbb902719b58e2de5c4758af1d9aa5293 100644 (file)
@@ -6,7 +6,6 @@ tests = {
     'alsactl-enums',
     'alsactl-card',
     'alsactl-card-info',
-    'alsactl-elem-info',
     'alsactl-elem-info-iec60958',
     'alsactl-elem-info-boolean',
     'alsactl-elem-info-bytes',