From: Takashi Sakamoto Date: Mon, 18 Nov 2019 04:22:44 +0000 (+0900) Subject: ctl: card_info: add an object to represent information of card X-Git-Tag: v0.1.0~421 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=0eab2d3f0bcc5be052600d554b16010a5e2f93ab;p=alsa-gobject.git ctl: card_info: add an object to represent information of card --- diff --git a/src/ctl/alsactl.map b/src/ctl/alsactl.map index 9ad22c3..05eb999 100644 --- a/src/ctl/alsactl.map +++ b/src/ctl/alsactl.map @@ -14,6 +14,8 @@ ALSA_GOBJECT_0_0_0 { "alsactl_card_get_type"; "alsactl_card_new"; "alsactl_card_open"; + + "alsactl_card_info_get_type"; local: *; }; diff --git a/src/ctl/card-info.c b/src/ctl/card-info.c new file mode 100644 index 0000000..d5f9ac0 --- /dev/null +++ b/src/ctl/card-info.c @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +#include "card-info.h" + +G_DEFINE_TYPE(ALSACtlCardInfo, alsactl_card_info, G_TYPE_OBJECT) + +static void alsactl_card_info_class_init(ALSACtlCardInfoClass *klass) +{ + return; +} + +static void alsactl_card_info_init(ALSACtlCardInfo *self) +{ + return; +} diff --git a/src/ctl/card-info.h b/src/ctl/card-info.h new file mode 100644 index 0000000..dfb43f7 --- /dev/null +++ b/src/ctl/card-info.h @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +#ifndef __ALSA_GOBJECT_ALSACTL_CARD_INFO__H__ +#define __ALSA_GOBJECT_ALSACTL_CARD_INFO__H__ + +#include +#include + +G_BEGIN_DECLS + +#define ALSACTL_TYPE_CARD_INFO (alsactl_card_info_get_type()) + +#define ALSACTL_CARD_INFO(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), \ + ALSACTL_TYPE_CARD_INFO, \ + ALSACtlCardInfo)) +#define ALSACTL_IS_CARD_INFO(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ + ALSACTL_TYPE_CARD_INFO)) + +#define ALSACTL_CARD_INFO_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), \ + ALSACTL_TYPE_CARD_INFO, \ + ALSACtlCardInfoClass)) +#define ALSACTL_IS_CARD_INFO_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), \ + ALSACTL_TYPE_CARD_INFO)) +#define ALSACTL_CARD_INFO_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS((obj), \ + ALSACTL_TYPE_CARD_INFO, \ + ALSACtlCardInfoClass)) + +typedef struct _ALSACtlCardInfo ALSACtlCardInfo; +typedef struct _ALSACtlCardInfoClass ALSACtlCardInfoClass; + +struct _ALSACtlCardInfo { + GObject parent_instance; +}; + +struct _ALSACtlCardInfoClass { + GObjectClass parent_class; +}; + +GType alsactl_card_info_get_type() G_GNUC_CONST; + +G_END_DECLS + +#endif diff --git a/src/ctl/meson.build b/src/ctl/meson.build index 4d9fadb..00c61f5 100644 --- a/src/ctl/meson.build +++ b/src/ctl/meson.build @@ -11,11 +11,13 @@ has_marshaller = false sources = files( 'query.c', 'card.c', + 'card-info.c', ) headers = files( 'query.h', 'card.h', + 'card-info.h', ) privates = files( diff --git a/src/ctl/privates.h b/src/ctl/privates.h index adc32ca..4a61640 100644 --- a/src/ctl/privates.h +++ b/src/ctl/privates.h @@ -7,9 +7,6 @@ #include #include -#include "query.h" -#include "card.h" - G_BEGIN_DECLS GQuark alsactl_error_quark(void); diff --git a/tests/alsactl-card-info b/tests/alsactl-card-info new file mode 100644 index 0000000..f05d3f4 --- /dev/null +++ b/tests/alsactl-card-info @@ -0,0 +1,18 @@ +#!/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.CardInfo() +props = () +methods = () +signals = () + +if not test(target, props, methods, signals): + exit(ENXIO) diff --git a/tests/meson.build b/tests/meson.build index 1384379..15abd89 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -5,6 +5,7 @@ tests = { 'ctl': [ 'alsactl-enums', 'alsactl-card', + 'alsactl-card-info', ], }