ctl: card_info: use an utility macro to declare GObject-derived object

Since gobject v2.44, an utility macro is available to declare
GObject-derived objects.

This commit replaces existent boireplates with it.

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

diff --git a/src/ctl/card-info.c b/src/ctl/card-info.c
index b56607baf7e02f9ae51725053d80297af4740b02..80ccd71b8941fb17fdd3b6c275015985cedc9b0a 100644 (file)
--- a/src/ctl/card-info.c
+++ b/src/ctl/card-info.c
@@ -13,9 +13,9 @@
  *
  * The object wraps 'struct snd_ctl_card_info' in UAPI of Linux sound subsystem.
  */
-struct _ALSACtlCardInfoPrivate {
+typedef struct {
     struct snd_ctl_card_info info;
-};
+} ALSACtlCardInfoPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(ALSACtlCardInfo, alsactl_card_info, G_TYPE_OBJECT)
 
 enum ctl_card_info_prop_type {

diff --git a/src/ctl/card-info.h b/src/ctl/card-info.h
index 63d9c05f4b5b1c6cec7192de3de3d83d164abccf..6eabf13cebb9143169f8c19cce82b48f81449b3d 100644 (file)
--- a/src/ctl/card-info.h
+++ b/src/ctl/card-info.h
@@ -8,42 +8,12 @@ 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;
-typedef struct _ALSACtlCardInfoPrivate  ALSACtlCardInfoPrivate;
-
-struct _ALSACtlCardInfo {
-    GObject parent_instance;
-
-    ALSACtlCardInfo *priv;
-};
+G_DECLARE_DERIVABLE_TYPE(ALSACtlCardInfo, alsactl_card_info, ALSACTL, CARD_INFO, GObject);
 
 struct _ALSACtlCardInfoClass {
     GObjectClass parent_class;
 };
 
-GType alsactl_card_info_get_type() G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif