seq: client_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/seq/client-info.c b/src/seq/client-info.c
index 5e430c8ac013eab922d50f42ec2e567343c91f3a..434d62881808b933eb83c3359f30740a3f273799 100644 (file)
--- a/src/seq/client-info.c
+++ b/src/seq/client-info.c
@@ -17,9 +17,9 @@
  *
  * The object wraps 'struct snd_seq_client_info' in UAPI of Linux sound subsystem.
  */
-struct _ALSASeqClientInfoPrivate {
+typedef struct {
     struct snd_seq_client_info info;
-};
+} ALSASeqClientInfoPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(ALSASeqClientInfo, alsaseq_client_info, G_TYPE_OBJECT)
 
 enum seq_client_info_prop_type {

diff --git a/src/seq/client-info.h b/src/seq/client-info.h
index 7311b2c567be82d2214dde885878e593d77122f5..128275cce12fcf9b76e800b9816532dd35e5ec25 100644 (file)
--- a/src/seq/client-info.h
+++ b/src/seq/client-info.h
@@ -8,42 +8,12 @@ G_BEGIN_DECLS
 
 #define ALSASEQ_TYPE_CLIENT_INFO     (alsaseq_client_info_get_type())
 
-#define ALSASEQ_CLIENT_INFO(obj)                            \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                      \
-                                ALSASEQ_TYPE_CLIENT_INFO,   \
-                                ALSASeqClientInfo))
-#define ALSASEQ_IS_CLIENT_INFO(obj)                         \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                      \
-                                ALSASEQ_TYPE_CLIENT_INFO))
-
-#define ALSASEQ_CLIENT_INFO_CLASS(klass)                    \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                       \
-                             ALSASEQ_TYPE_CLIENT_INFO,      \
-                             ALSASeqClientInfoClass))
-#define ALSASEQ_IS_CLIENT_INFO_CLASS(klass)                 \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                       \
-                             ALSASEQ_TYPE_CLIENT_INFO))
-#define ALSASEQ_CLIENT_INFO_GET_CLASS(obj)                  \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                       \
-                               ALSASEQ_TYPE_CLIENT_INFO,    \
-                               ALSASeqClientInfoClass))
-
-typedef struct _ALSASeqClientInfo           ALSASeqClientInfo;
-typedef struct _ALSASeqClientInfoClass      ALSASeqClientInfoClass;
-typedef struct _ALSASeqClientInfoPrivate    ALSASeqClientInfoPrivate;
-
-struct _ALSASeqClientInfo {
-    GObject parent_instance;
-
-    ALSASeqClientInfoPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE(ALSASeqClientInfo, alsaseq_client_info, ALSASEQ, CLIENT_INFO, GObject);
 
 struct _ALSASeqClientInfoClass {
     GObjectClass parent_class;
 };
 
-GType alsaseq_client_info_get_type() G_GNUC_CONST;
-
 ALSASeqClientInfo *alsaseq_client_info_new();
 
 void alsaseq_client_info_set_event_filter(ALSASeqClientInfo *self,