seq: queue_timer: 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/queue-timer.c b/src/seq/queue-timer.c
index 2429bf952827cbd2f4e54a6dc7274f5d8ff1e848..0bd072e4e8c33b3ba731f2bf4fc70439ec07b1bb 100644 (file)
--- a/src/seq/queue-timer.c
+++ b/src/seq/queue-timer.c
@@ -11,9 +11,9 @@
  *
  * The object wraps 'struct snd_seq_queue_timer' in UAPI of Linux sound subsystem.
  */
-struct _ALSASeqQueueTimerPrivate {
+typedef struct {
     struct snd_seq_queue_timer timer;
-};
+} ALSASeqQueueTimerPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(ALSASeqQueueTimer, alsaseq_queue_timer, G_TYPE_OBJECT)
 
 enum seq_queue_timer_prop_type {

diff --git a/src/seq/queue-timer.h b/src/seq/queue-timer.h
index 67b8800dc81cf31cc04789a020aa5feb3c5bdada..a30db71d6bf8a3a10d93b69b0f6b2499dace4ff9 100644 (file)
--- a/src/seq/queue-timer.h
+++ b/src/seq/queue-timer.h
@@ -8,42 +8,12 @@ G_BEGIN_DECLS
 
 #define ALSASEQ_TYPE_QUEUE_TIMER     (alsaseq_queue_timer_get_type())
 
-#define ALSASEQ_QUEUE_TIMER(obj)                            \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                      \
-                                ALSASEQ_TYPE_QUEUE_TIMER,   \
-                                ALSASeqQueueTimer))
-#define ALSASEQ_IS_QUEUE_TIMER(obj)                         \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                      \
-                                ALSASEQ_TYPE_QUEUE_TIMER))
-
-#define ALSASEQ_QUEUE_TIMER_CLASS(klass)                    \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                       \
-                             ALSASEQ_TYPE_QUEUE_TIMER,      \
-                             ALSASeqQueueTimerClass))
-#define ALSASEQ_IS_QUEUE_TIMER_CLASS(klass)                 \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                       \
-                             ALSASEQ_TYPE_QUEUE_TIMER))
-#define ALSASEQ_QUEUE_TIMER_GET_CLASS(obj)                  \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                       \
-                               ALSASEQ_TYPE_QUEUE_TIMER,    \
-                               ALSASeqQueueTimerClass))
-
-typedef struct _ALSASeqQueueTimer           ALSASeqQueueTimer;
-typedef struct _ALSASeqQueueTimerClass      ALSASeqQueueTimerClass;
-typedef struct _ALSASeqQueueTimerPrivate    ALSASeqQueueTimerPrivate;
-
-struct _ALSASeqQueueTimer {
-    GObject parent_instance;
-
-    ALSASeqQueueTimerPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE(ALSASeqQueueTimer, alsaseq_queue_timer, ALSASEQ, QUEUE_TIMER, GObject);
 
 struct _ALSASeqQueueTimerClass {
     GObjectClass parent_class;
 };
 
-GType alsaseq_queue_timer_get_type() G_GNUC_CONST;
-
 ALSASeqQueueTimer *alsaseq_queue_timer_new();
 
 void alsaseq_queue_timer_get_alsa_data(ALSASeqQueueTimer *self,