seq: subscribe_data: 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/seq/subscribe-data.c b/src/seq/subscribe-data.c
index 3515187baec41d3a8b1116d9efe1217eb6168915..531a87d863faa364509680d0ec3d5d9c1db0a21e 100644 (file)
--- a/src/seq/subscribe-data.c
+++ b/src/seq/subscribe-data.c
@@ -15,9 +15,9 @@
  * The object wraps 'struct snd_seq_port_subscribe' in UAPI of Linux sound
  * subsystem.
  */
-struct _ALSASeqSubscribeDataPrivate {
+typedef struct {
     struct snd_seq_port_subscribe data;
-};
+} ALSASeqSubscribeDataPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(ALSASeqSubscribeData, alsaseq_subscribe_data, G_TYPE_OBJECT)
 
 enum seq_subscribe_data_prop_type {

diff --git a/src/seq/subscribe-data.h b/src/seq/subscribe-data.h
index 4543b2256e6ba7f3d23d4f7f06f96a128db154c3..b921307f92b61fa6db3c6cd6abc77cc6984fb50b 100644 (file)
--- a/src/seq/subscribe-data.h
+++ b/src/seq/subscribe-data.h
@@ -8,42 +8,12 @@ G_BEGIN_DECLS
 
 #define ALSASEQ_TYPE_SUBSCRIBE_DATA     (alsaseq_subscribe_data_get_type())
 
-#define ALSASEQ_SUBSCRIBE_DATA(obj)                             \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                          \
-                                ALSASEQ_TYPE_SUBSCRIBE_DATA,    \
-                                ALSASeqSubscribeData))
-#define ALSASEQ_IS_SUBSCRIBE_DATA(obj)                          \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                          \
-                                ALSASEQ_TYPE_SUBSCRIBE_DATA))
-
-#define ALSASEQ_SUBSCRIBE_DATA_CLASS(klass)                     \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                           \
-                             ALSASEQ_TYPE_SUBSCRIBE_DATA,       \
-                             ALSASeqSubscribeDataClass))
-#define ALSASEQ_IS_SUBSCRIBE_DATA_CLASS(klass)                  \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                           \
-                             ALSASEQ_TYPE_SUBSCRIBE_DATA))
-#define ALSASEQ_SUBSCRIBE_DATA_GET_CLASS(obj)                   \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                           \
-                               ALSASEQ_TYPE_SUBSCRIBE_DATA,     \
-                               ALSASeqSubscribeDataClass))
-
-typedef struct _ALSASeqSubscribeData            ALSASeqSubscribeData;
-typedef struct _ALSASeqSubscribeDataClass       ALSASeqSubscribeDataClass;
-typedef struct _ALSASeqSubscribeDataPrivate     ALSASeqSubscribeDataPrivate;
-
-struct _ALSASeqSubscribeData {
-    GObject parent_instance;
-
-    ALSASeqSubscribeData *priv;
-};
+G_DECLARE_DERIVABLE_TYPE(ALSASeqSubscribeData, alsaseq_subscribe_data, ALSASEQ, SUBSCRIBE_DATA, GObject);
 
 struct _ALSASeqSubscribeDataClass {
     GObjectClass parent_class;
 };
 
-GType alsaseq_subscribe_data_get_type() G_GNUC_CONST;
-
 ALSASeqSubscribeData *alsaseq_subscribe_data_new();
 
 G_END_DECLS