From 64234aa13ea8cea5f80f716819b2686f3b362ea0 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Mon, 11 Apr 2022 17:42:26 +0900 Subject: [PATCH] seq: queue_status: 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-status.c | 4 ++-- src/seq/queue-status.h | 32 +------------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/src/seq/queue-status.c b/src/seq/queue-status.c index c331770..c9ac495 100644 --- a/src/seq/queue-status.c +++ b/src/seq/queue-status.c @@ -12,9 +12,9 @@ * The object wraps 'struct snd_seq_queue_status' in UAPI of Linux sound * subsystem. */ -struct _ALSASeqQueueStatusPrivate { +typedef struct { struct snd_seq_queue_status status; -}; +} ALSASeqQueueStatusPrivate; G_DEFINE_TYPE_WITH_PRIVATE(ALSASeqQueueStatus, alsaseq_queue_status, G_TYPE_OBJECT) enum seq_queue_status_prop_type { diff --git a/src/seq/queue-status.h b/src/seq/queue-status.h index 1674b72..6d9956a 100644 --- a/src/seq/queue-status.h +++ b/src/seq/queue-status.h @@ -8,42 +8,12 @@ G_BEGIN_DECLS #define ALSASEQ_TYPE_QUEUE_STATUS (alsaseq_queue_status_get_type()) -#define ALSASEQ_QUEUE_STATUS(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - ALSASEQ_TYPE_QUEUE_STATUS, \ - ALSASeqQueueStatus)) -#define ALSASEQ_IS_QUEUE_STATUS(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ - ALSASEQ_TYPE_QUEUE_STATUS)) - -#define ALSASEQ_QUEUE_STATUS_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), \ - ALSASEQ_TYPE_QUEUE_STATUS, \ - ALSASeqQueueStatusClass)) -#define ALSASEQ_IS_QUEUE_STATUS_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), \ - ALSASEQ_TYPE_QUEUE_STATUS)) -#define ALSASEQ_QUEUE_STATUS_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS((obj), \ - ALSASEQ_TYPE_QUEUE_STATUS, \ - ALSASeqQueueStatusClass)) - -typedef struct _ALSASeqQueueStatus ALSASeqQueueStatus; -typedef struct _ALSASeqQueueStatusClass ALSASeqQueueStatusClass; -typedef struct _ALSASeqQueueStatusPrivate ALSASeqQueueStatusPrivate; - -struct _ALSASeqQueueStatus { - GObject parent_instance; - - ALSASeqQueueStatusPrivate *priv; -}; +G_DECLARE_DERIVABLE_TYPE(ALSASeqQueueStatus, alsaseq_queue_status, ALSASEQ, QUEUE_STATUS, GObject); struct _ALSASeqQueueStatusClass { GObjectClass parent_class; }; -GType alsaseq_queue_status_get_type() G_GNUC_CONST; - ALSASeqQueueStatus *alsaseq_queue_status_new(); void alsaseq_queue_status_get_tick_time(ALSASeqQueueStatus *self, -- 2.47.3