seq: client_pool: 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/client-pool.c b/src/seq/client-pool.c
index 81ed91605aabc14f2b2c0f18f3ec08e8498bf1ba..c363f7376103a2385730c6685dc4d7fb2c72a166 100644 (file)
--- a/src/seq/client-pool.c
+++ b/src/seq/client-pool.c
@@ -15,9 +15,9 @@
  *
  * The object wraps 'struct snd_seq_client_pool' in UAPI of Linux sound subsystem.
  */
-struct _ALSASeqClientPoolPrivate {
+typedef struct {
     struct snd_seq_client_pool pool;
-};
+} ALSASeqClientPoolPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(ALSASeqClientPool, alsaseq_client_pool, G_TYPE_OBJECT)
 
 enum seq_client_pool_prop_type {

diff --git a/src/seq/client-pool.h b/src/seq/client-pool.h
index b2c2414dcac6f3a676223eb65b78f7c11df27357..ca80dba6ee92a42e7eac4a45c479d1665af71ebc 100644 (file)
--- a/src/seq/client-pool.h
+++ b/src/seq/client-pool.h
@@ -8,42 +8,12 @@ G_BEGIN_DECLS
 
 #define ALSASEQ_TYPE_CLIENT_POOL        (alsaseq_client_pool_get_type())
 
-#define ALSASEQ_CLIENT_POOL(obj)                            \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                      \
-                                ALSASEQ_TYPE_CLIENT_POOL,   \
-                                ALSASeqClientPool))
-#define ALSASEQ_IS_CLIENT_POOL(obj)                         \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                      \
-                                ALSASEQ_TYPE_CLIENT_POOL))
-
-#define ALSASEQ_CLIENT_POOL_CLASS(klass)                    \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                       \
-                             ALSASEQ_TYPE_CLIENT_POOL,      \
-                             ALSASeqClientPoolClass))
-#define ALSASEQ_IS_CLIENT_POOL_CLASS(klass)                 \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                       \
-                             ALSASEQ_TYPE_CLIENT_POOL))
-#define ALSASEQ_CLIENT_POOL_GET_CLASS(obj)                  \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                       \
-                               ALSASEQ_TYPE_CLIENT_POOL,    \
-                               ALSASeqClientPoolClass))
-
-typedef struct _ALSASeqClientPool           ALSASeqClientPool;
-typedef struct _ALSASeqClientPoolClass      ALSASeqClientPoolClass;
-typedef struct _ALSASeqClientPoolPrivate    ALSASeqClientPoolPrivate;
-
-struct _ALSASeqClientPool {
-    GObject parent_instance;
-
-    ALSASeqClientPoolPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE(ALSASeqClientPool, alsaseq_client_pool, ALSASEQ, CLIENT_POOL, GObject);
 
 struct _ALSASeqClientPoolClass {
     GObjectClass parent_class;
 };
 
-GType alsaseq_client_pool_get_type() G_GNUC_CONST;
-
 ALSASeqClientPool *alsaseq_client_pool_new();
 
 G_END_DECLS