From: Takashi Sakamoto Date: Fri, 12 Jun 2020 04:19:45 +0000 (+0900) Subject: ctl: elem_info_bool: dismiss ALSACtlElemInfoBool X-Git-Tag: v0.1.0~71 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=ac454fcacad4f6a1e84527eb1f844171aa4d973c;p=alsa-gobject.git ctl: elem_info_bool: dismiss ALSACtlElemInfoBool Signed-off-by: Takashi Sakamoto --- diff --git a/doc/reference/ctl/alsactl-docs.xml b/doc/reference/ctl/alsactl-docs.xml index 1a71241..22458bd 100644 --- a/doc/reference/ctl/alsactl-docs.xml +++ b/doc/reference/ctl/alsactl-docs.xml @@ -37,7 +37,6 @@ - diff --git a/doc/reference/ctl/alsactl.types b/doc/reference/ctl/alsactl.types index 40bc17a..d314470 100644 --- a/doc/reference/ctl/alsactl.types +++ b/doc/reference/ctl/alsactl.types @@ -7,7 +7,6 @@ alsactl_card_get_type alsactl_card_info_get_type alsactl_elem_id_get_type alsactl_elem_info_get_type -alsactl_elem_info_bool_get_type alsactl_elem_info_int_get_type alsactl_elem_info_enum_get_type alsactl_elem_info_bytes_get_type diff --git a/src/ctl/elem-info-bool.c b/src/ctl/elem-info-bool.c deleted file mode 100644 index e0bd4f6..0000000 --- a/src/ctl/elem-info-bool.c +++ /dev/null @@ -1,96 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-later -#include "elem-info-bool.h" -#include "privates.h" - -/** - * SECTION: elem-info-bool - * @Title: ALSACtlElemInfoBool - * @Short_description: A GObject-derived object to represent the information - * of boolean type of element - * - * A #ALSACtlElemInfoBool is a GObject-derived object to represent the - * information of boolean type of element, which contains boolean values. The - * object inherits methods and properties of #ALSACtlElemInfo. The call of - * alsactl_card_get_elem_info() can returns the instance of object, or the call - * of alsactl_card_add_elems() requires the instance of object as argument. - */ -G_DEFINE_TYPE(ALSACtlElemInfoBool, alsactl_elem_info_bool, ALSACTL_TYPE_ELEM_INFO) - -enum ctl_elem_info_bool_prop_type { - CTL_ELEM_INFO_BOOL_PROP_VALUE_COUNT = 1, - CTL_ELEM_INFO_BOOL_PROP_COUNT, -}; -static GParamSpec *ctl_elem_info_bool_props[CTL_ELEM_INFO_BOOL_PROP_COUNT] = { NULL, }; - -static void ctl_elem_info_bool_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_BOOL_PROP_VALUE_COUNT: - info->count = g_value_get_uint(val); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec); - break; - } -} -static void ctl_elem_info_bool_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_BOOL_PROP_VALUE_COUNT: - g_value_set_uint(val, info->count); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, id, spec); - break; - } -} - - -static void alsactl_elem_info_bool_class_init(ALSACtlElemInfoBoolClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS(klass); - - gobject_class->set_property = ctl_elem_info_bool_set_property; - gobject_class->get_property = ctl_elem_info_bool_get_property; - - ctl_elem_info_bool_props[CTL_ELEM_INFO_BOOL_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_BOOL_PROP_COUNT, - ctl_elem_info_bool_props); -} - -static void alsactl_elem_info_bool_init(ALSACtlElemInfoBool *self) -{ - return; -} - -/** - * alsactl_elem_info_bool_new: - * - * Allocate and return an instance of ALSACtlElemInfoBool. - * - * Returns: A #ALSACtlElemInfoBool. - */ -ALSACtlElemInfoBool *alsactl_elem_info_bool_new() -{ - return g_object_new(ALSACTL_TYPE_ELEM_INFO_BOOL, - "type", ALSACTL_ELEM_TYPE_BOOLEAN, NULL); -} diff --git a/src/ctl/elem-info-bool.h b/src/ctl/elem-info-bool.h deleted file mode 100644 index d79a516..0000000 --- a/src/ctl/elem-info-bool.h +++ /dev/null @@ -1,51 +0,0 @@ -// SPDX-License-Identifier: LGPL-3.0-or-later -#ifndef __ALSA_GOBJECT_ALSACTL_ELEM_INFO_BOOL__H__ -#define __ALSA_GOBJECT_ALSACTL_ELEM_INFO_BOOL__H__ - -#include -#include - -#include - -G_BEGIN_DECLS - -#define ALSACTL_TYPE_ELEM_INFO_BOOL (alsactl_elem_info_bool_get_type()) - -#define ALSACTL_ELEM_INFO_BOOL(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - ALSACTL_TYPE_ELEM_INFO_BOOL, \ - ALSACtlElemInfoBool)) -#define ALSACTL_IS_ELEM_INFO_BOOL(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ - ALSACTL_TYPE_ELEM_INFO_BOOL)) - -#define ALSACTL_ELEM_INFO_BOOL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), \ - ALSACTL_TYPE_ELEM_INFO_BOOL, \ - ALSACtlElemInfoBoolClass)) -#define ALSACTL_IS_ELEM_INFO_BOOL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), \ - ALSACTL_TYPE_ELEM_INFO_BOOL)) -#define ALSACTL_ELEM_INFO_BOOL_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS((obj), \ - ALSACTL_TYPE_ELEM_INFO_BOOL, \ - ALSACtlElemInfoBoolClass)) - -typedef struct _ALSACtlElemInfoBool ALSACtlElemInfoBool; -typedef struct _ALSACtlElemInfoBoolClass ALSACtlElemInfoBoolClass; - -struct _ALSACtlElemInfoBool { - ALSACtlElemInfo parent_instance; -}; - -struct _ALSACtlElemInfoBoolClass { - ALSACtlElemInfoClass parent_class; -}; - -GType alsactl_elem_info_bool_get_type(void) G_GNUC_CONST; - -ALSACtlElemInfoBool *alsactl_elem_info_bool_new(); - -G_END_DECLS - -#endif diff --git a/src/ctl/meson.build b/src/ctl/meson.build index fee5d77..85647ef 100644 --- 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-bool.c', 'elem-info-int.c', 'elem-info-enum.c', 'elem-info-bytes.c', @@ -29,7 +28,6 @@ headers = files( 'card-info.h', 'elem-id.h', 'elem-info.h', - 'elem-info-bool.h', 'elem-info-int.h', 'elem-info-enum.h', 'elem-info-bytes.h', diff --git a/tests/alsactl-elem-info-bool b/tests/alsactl-elem-info-bool deleted file mode 100644 index c4b6cc3..0000000 --- a/tests/alsactl-elem-info-bool +++ /dev/null @@ -1,22 +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.ElemInfoBool() -props = ( - 'value-count', -) -methods = ( - 'new', -) -signals = () - -if not test(target, props, methods, signals): - exit(ENXIO) diff --git a/tests/meson.build b/tests/meson.build index 7113515..7c75136 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -7,7 +7,6 @@ tests = { 'alsactl-card', 'alsactl-card-info', 'alsactl-elem-info', - 'alsactl-elem-info-bool', 'alsactl-elem-info-int', 'alsactl-elem-info-enum', 'alsactl-elem-info-bytes',