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 <o-takashi@sakamocchi.jp>

diff --git a/src/seq/queue-tempo.c b/src/seq/queue-tempo.c
index 38a79c6ad6a23458f48b4e9735393f3167436c73..27fd32fc34b16aeeb6feec8b6f4a1baae774ecf2 100644 (file)
--- 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 dc63a641f8e6e97b92f4eb9652f24e56e04f8924..46d691bb6f635918b4f81ce717ba103356f1f499 100644 (file)
--- 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]);