From 5b452ab54b348f0cd466206a0b04194472e3ddda Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Mon, 11 Apr 2022 17:42:26 +0900 Subject: [PATCH] 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 --- src/seq/queue-timer.c | 4 ++-- src/seq/queue-timer.h | 32 +------------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/src/seq/queue-timer.c b/src/seq/queue-timer.c index 2429bf9..0bd072e 100644 --- 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 67b8800..a30db71 100644 --- 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, -- 2.47.3