ctl: elem_info_int64: dismiss ALSACtlElemInfoInt64

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

diff --git a/doc/reference/ctl/alsactl-docs.xml b/doc/reference/ctl/alsactl-docs.xml
index cb4d6cf46a2d6be75f45868e2bad0bf6ad2044d6..9a75c779ded8a50b2cc72ba25b66127efaf8c44c 100644 (file)
--- a/doc/reference/ctl/alsactl-docs.xml
+++ b/doc/reference/ctl/alsactl-docs.xml
@@ -37,7 +37,6 @@
         <xi:include href="xml/card-info.xml"/>
         <xi:include href="xml/elem-id.xml"/>
         <xi:include href="xml/elem-info.xml"/>
-        <xi:include href="xml/elem-info-int64.xml"/>
         <xi:include href="xml/elem-value.xml"/>
         <xi:include href="xml/alsactl-sigs-marshal.xml"/>
     </chapter>

diff --git a/doc/reference/ctl/alsactl.types b/doc/reference/ctl/alsactl.types
index e8a8b327ed437d785835d7c352db2b8a49db744e..308e97877c73a491efb2d0fbe0a1d7f4a1a0a1bb 100644 (file)
--- a/doc/reference/ctl/alsactl.types
+++ b/doc/reference/ctl/alsactl.types
@@ -7,5 +7,4 @@ alsactl_card_get_type
 alsactl_card_info_get_type
 alsactl_elem_id_get_type
 alsactl_elem_info_get_type
-alsactl_elem_info_int64_get_type
 alsactl_elem_value_get_type

diff --git a/src/ctl/elem-info-int64.c b/src/ctl/elem-info-int64.c
deleted file mode 100644 (file)
index dbbde24..0000000
--- a/src/ctl/elem-info-int64.c
+++ /dev/null
@@ -1,137 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-later
-#include "elem-info-int64.h"
-#include "privates.h"
-
-/**
- * SECTION: elem-info-int64
- * @Title: ALSACtlElemInfoInt64
- * @Short_description: A GObject-derived object to represent the information
- *                     of integer64 type of element
- *
- * A #ALSACtlElemInfoInt64 is a GObject-derived object to represent the
- * information of integer type of element, which contains 64 bit integer values.
- * The object inherits methods and properties of #ALSACtlElemInfo. A call of
- * alsactl_card_get_elem_info() can returns the instance of object, or a call
- * of alsactl_card_add_elems() requires the instance of object as argument.
- */
-G_DEFINE_TYPE(ALSACtlElemInfoInt64, alsactl_elem_info_int64, ALSACTL_TYPE_ELEM_INFO)
-
-enum ctl_elem_info_int64_prop_type {
-    CTL_ELEM_INFO_INT64_PROP_VALUE_COUNT = 1,
-    CTL_ELEM_INFO_INT64_PROP_MIN,
-    CTL_ELEM_INFO_INT64_PROP_MAX,
-    CTL_ELEM_INFO_INT64_PROP_STEP,
-    CTL_ELEM_INFO_INT64_PROP_COUNT,
-};
-static GParamSpec *ctl_elem_info_int64_props[CTL_ELEM_INFO_INT64_PROP_COUNT] = { NULL, };
-
-static void ctl_elem_info_int64_set_property(GObject *obj, guint id,
-                                           const GValue *val, GParamSpec *spec)
-{
-    ALSACtlElemInfo *parent = ALSACTL_ELEM_INFO(obj);
-    struct snd_ctl_elem_info *info;
-
-    ctl_elem_info_refer_private(parent, &info);
-
-    switch (id) {
-    case CTL_ELEM_INFO_INT64_PROP_VALUE_COUNT:
-        info->count = g_value_get_uint(val);
-        break;
-    case CTL_ELEM_INFO_INT64_PROP_MIN:
-        info->value.integer64.min = g_value_get_int64(val);
-        break;
-    case CTL_ELEM_INFO_INT64_PROP_MAX:
-        info->value.integer64.min = g_value_get_int64(val);
-        break;
-    case CTL_ELEM_INFO_INT64_PROP_STEP:
-        info->value.integer64.min = g_value_get_int64(val);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec);
-        break;
-    }
-}
-
-static void ctl_elem_info_int64_get_property(GObject *obj, guint id,
-                                             GValue *val, GParamSpec *spec)
-{
-    ALSACtlElemInfo *parent = ALSACTL_ELEM_INFO(obj);
-    struct snd_ctl_elem_info *info;
-
-    ctl_elem_info_refer_private(parent, &info);
-
-    switch (id) {
-    case CTL_ELEM_INFO_INT64_PROP_VALUE_COUNT:
-        g_value_set_uint(val, info->count);
-        break;
-    case CTL_ELEM_INFO_INT64_PROP_MIN:
-        g_value_set_int64(val, info->value.integer64.min);
-        break;
-    case CTL_ELEM_INFO_INT64_PROP_MAX:
-        g_value_set_int64(val, info->value.integer64.max);
-        break;
-    case CTL_ELEM_INFO_INT64_PROP_STEP:
-        g_value_set_int64(val, info->value.integer64.step);
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec);
-        break;
-    }
-}
-
-static void alsactl_elem_info_int64_class_init(ALSACtlElemInfoInt64Class *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
-
-    gobject_class->set_property = ctl_elem_info_int64_set_property;
-    gobject_class->get_property = ctl_elem_info_int64_get_property;
-
-    ctl_elem_info_int64_props[CTL_ELEM_INFO_INT64_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);
-
-    ctl_elem_info_int64_props[CTL_ELEM_INFO_INT64_PROP_MIN] =
-        g_param_spec_int64("min", "min",
-                           "The minimum value for data of this element",
-                           G_MININT64, G_MAXINT64,
-                           0,
-                           G_PARAM_READWRITE);
-
-    ctl_elem_info_int64_props[CTL_ELEM_INFO_INT64_PROP_MAX] =
-        g_param_spec_int64("max", "max",
-                           "The maximum value for data of this element",
-                           G_MININT64, G_MAXINT64,
-                           0,
-                           G_PARAM_READWRITE);
-
-    ctl_elem_info_int64_props[CTL_ELEM_INFO_INT64_PROP_STEP] =
-        g_param_spec_int64("step", "step",
-                           "The gap of value for data of this element",
-                           G_MININT64, G_MAXINT64,
-                           0,
-                           G_PARAM_READWRITE);
-
-    g_object_class_install_properties(gobject_class,
-                    CTL_ELEM_INFO_INT64_PROP_COUNT, ctl_elem_info_int64_props);
-}
-
-static void alsactl_elem_info_int64_init(ALSACtlElemInfoInt64 *self)
-{
-    return;
-}
-
-/**
- * alsactl_elem_info_int64_new:
- *
- * Allocate and return an instance of ALSACtlElemInfoInt64.
- *
- * Returns: A #ALSACtlElemInfoInt64.
- */
-ALSACtlElemInfoInt64 *alsactl_elem_info_int64_new()
-{
-    return g_object_new(ALSACTL_TYPE_ELEM_INFO_INT64,
-                        "type", ALSACTL_ELEM_TYPE_INTEGER64, NULL);
-}

diff --git a/src/ctl/elem-info-int64.h b/src/ctl/elem-info-int64.h
deleted file mode 100644 (file)
index 224231a..0000000
--- a/src/ctl/elem-info-int64.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: LGPL-3.0-or-later
-#ifndef __ALSA_GOBJECT_ALSACTL_ELEM_INFO_INT64__H__
-#define __ALSA_GOBJECT_ALSACTL_ELEM_INFO_INT64__H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <ctl/elem-info.h>
-
-G_BEGIN_DECLS
-
-#define ALSACTL_TYPE_ELEM_INFO_INT64        (alsactl_elem_info_int64_get_type())
-
-#define ALSACTL_ELEM_INFO_INT64(obj)                            \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                          \
-                                ALSACTL_TYPE_ELEM_INFO_INT64,   \
-                                ALSACtlElemInfoInt64))
-#define ALSACTL_IS_ELEM_INFO_INT64(obj)                         \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                          \
-                                ALSACTL_TYPE_ELEM_INFO_INT64))
-
-#define ALSACTL_ELEM_INFO_INT64_CLASS(klass)                    \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                           \
-                             ALSACTL_TYPE_ELEM_INFO_INT64,      \
-                             ALSACtlElemInfoInt64Class))
-#define ALSACTL_IS_ELEM_INFO_INT64_CLASS(klass)                 \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                           \
-                             ALSACTL_TYPE_ELEM_INFO_INT64))
-#define ALSACTL_ELEM_INFO_INT64_GET_CLASS(obj)                  \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                           \
-                               ALSACTL_TYPE_ELEM_INFO_INT64,    \
-                               ALSACtlElemInfoInt64Class))
-
-typedef struct _ALSACtlElemInfoInt64        ALSACtlElemInfoInt64;
-typedef struct _ALSACtlElemInfoInt64Class   ALSACtlElemInfoInt64Class;
-
-struct _ALSACtlElemInfoInt64 {
-    ALSACtlElemInfo parent_instance;
-};
-
-struct _ALSACtlElemInfoInt64Class {
-    ALSACtlElemInfoClass parent_class;
-};
-
-GType alsactl_elem_info_int64_get_type(void) G_GNUC_CONST;
-
-ALSACtlElemInfoInt64 *alsactl_elem_info_int64_new();
-
-G_END_DECLS
-
-#endif

diff --git a/src/ctl/meson.build b/src/ctl/meson.build
index 6c963459bf30f59c38d727dd0226610ead4fb990..9a3a45c99e00c0038ced1e8d5687e6a8f18af86e 100644 (file)
--- a/src/ctl/meson.build
+++ b/src/ctl/meson.build
@@ -14,7 +14,6 @@ sources = files(
   'card-info.c',
   'elem-id.c',
   'elem-info.c',
-  'elem-info-int64.c',
   'elem-value.c',
 )
 
@@ -24,7 +23,6 @@ headers = files(
   'card-info.h',
   'elem-id.h',
   'elem-info.h',
-  'elem-info-int64.h',
   'elem-value.h',
 )
 

diff --git a/tests/alsactl-elem-info-int64 b/tests/alsactl-elem-info-int64
deleted file mode 100644 (file)
index 41ed489..0000000
--- a/tests/alsactl-elem-info-int64
+++ /dev/null
@@ -1,25 +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.ElemInfoInt64()
-props = (
-    'value-count',
-    'min',
-    'max',
-    'step',
-)
-methods = (
-    'new',
-)
-signals = ()
-
-if not test(target, props, methods, signals):
-    exit(ENXIO)

diff --git a/tests/meson.build b/tests/meson.build
index 911a6b5b71dfa2d533d0da7199808661f7b6af4b..89b1baf111b8a0a9566dba0a345916493db66401 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -7,7 +7,6 @@ tests = {
     'alsactl-card',
     'alsactl-card-info',
     'alsactl-elem-info',
-    'alsactl-elem-info-int64',
     'alsactl-elem-value',
   ],
   'timer': [