From cea1afe833c64da32e7d631bb4feef8d2cd12dcf Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Mon, 11 Apr 2022 17:42:26 +0900 Subject: [PATCH] seq: queue_tempo: 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-tempo.c | 4 ++-- src/seq/queue-tempo.h | 32 +------------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/src/seq/queue-tempo.c b/src/seq/queue-tempo.c index 38a79c6..27fd32f 100644 --- a/src/seq/queue-tempo.c +++ b/src/seq/queue-tempo.c @@ -11,9 +11,9 @@ * * The object wraps 'struct snd_seq_queue_tempo' in UAPI of Linux sound subsystem. */ -struct _ALSASeqQueueTempoPrivate { +typedef struct { struct snd_seq_queue_tempo tempo; -}; +} ALSASeqQueueTempoPrivate; G_DEFINE_TYPE_WITH_PRIVATE(ALSASeqQueueTempo, alsaseq_queue_tempo, G_TYPE_OBJECT) enum seq_queue_tempo_prop_type { diff --git a/src/seq/queue-tempo.h b/src/seq/queue-tempo.h index dc63a64..46d691b 100644 --- a/src/seq/queue-tempo.h +++ b/src/seq/queue-tempo.h @@ -8,42 +8,12 @@ G_BEGIN_DECLS #define ALSASEQ_TYPE_QUEUE_TEMPO (alsaseq_queue_tempo_get_type()) -#define ALSASEQ_QUEUE_TEMPO(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - ALSASEQ_TYPE_QUEUE_TEMPO, \ - ALSASeqQueueTempo)) -#define ALSASEQ_IS_QUEUE_TEMPO(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ - ALSASEQ_TYPE_QUEUE_TEMPO)) - -#define ALSASEQ_QUEUE_TEMPO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), \ - ALSASEQ_TYPE_QUEUE_TEMPO, \ - ALSASeqQueueTempoClass)) -#define ALSASEQ_IS_QUEUE_TEMPO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), \ - ALSASEQ_TYPE_QUEUE_TEMPO)) -#define ALSASEQ_QUEUE_TEMPO_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS((obj), \ - ALSASEQ_TYPE_QUEUE_TEMPO, \ - ALSASeqQueueTempoClass)) - -typedef struct _ALSASeqQueueTempo ALSASeqQueueTempo; -typedef struct _ALSASeqQueueTempoClass ALSASeqQueueTempoClass; -typedef struct _ALSASeqQueueTempoPrivate ALSASeqQueueTempoPrivate; - -struct _ALSASeqQueueTempo { - GObject parent_instance; - - ALSASeqQueueTempoPrivate *priv; -}; +G_DECLARE_DERIVABLE_TYPE(ALSASeqQueueTempo, alsaseq_queue_tempo, ALSASEQ, QUEUE_TEMPO, GObject); struct _ALSASeqQueueTempoClass { GObjectClass parent_class; }; -GType alsaseq_queue_tempo_get_type() G_GNUC_CONST; - ALSASeqQueueTempo *alsaseq_queue_tempo_new(); void alsaseq_queue_tempo_get_skew(ALSASeqQueueTempo *self, const guint32 *skew[2]); -- 2.47.3