From 943e2ee8a6e97b38d2792baec76858d225d751e0 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Mon, 11 Apr 2022 17:42:26 +0900 Subject: [PATCH] rawmidi: stream_pair: 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/rawmidi/stream-pair.c | 4 ++-- src/rawmidi/stream-pair.h | 32 +------------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/src/rawmidi/stream-pair.c b/src/rawmidi/stream-pair.c index 919a0d2..c2ca684 100644 --- a/src/rawmidi/stream-pair.c +++ b/src/rawmidi/stream-pair.c @@ -34,11 +34,11 @@ * alsarawmidi_stream_pair_get_substream_status() is available to check the * space in the intermediate buffer according to direction argument. */ -struct _ALSARawmidiStreamPairPrivate { +typedef struct { int fd; char *devnode; guint16 proto_ver_triplet[3]; -}; +} ALSARawmidiStreamPairPrivate; G_DEFINE_TYPE_WITH_PRIVATE(ALSARawmidiStreamPair, alsarawmidi_stream_pair, G_TYPE_OBJECT) /** diff --git a/src/rawmidi/stream-pair.h b/src/rawmidi/stream-pair.h index b0e5494..8298e32 100644 --- a/src/rawmidi/stream-pair.h +++ b/src/rawmidi/stream-pair.h @@ -8,40 +8,12 @@ G_BEGIN_DECLS #define ALSARAWMIDI_TYPE_STREAM_PAIR (alsarawmidi_stream_pair_get_type()) -#define ALSARAWMIDI_STREAM_PAIR(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - ALSARAWMIDI_TYPE_STREAM_PAIR, \ - ALSARawmidiStreamPair)) -#define ALSARAWMIDI_IS_STREAM_PAIR(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ - ALSARAWMIDI_TYPE_STREAM_PAIR)) - -#define ALSARAWMIDI_STREAM_PAIR_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), \ - ALSARAWMIDI_TYPE_STREAM_PAIR, \ - ALSARawmidiStreamPairClass)) -#define ALSARAWMIDI_IS_STREAM_PAIR_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass), \ - ALSARAWMIDI_TYPE_STREAM_PAIR)) -#define ALSARAWMIDI_STREAM_PAIR_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS((obj), \ - ALSARAWMIDI_TYPE_STREAM_PAIR, \ - ALSARawmidiStreamPairClass)) +G_DECLARE_DERIVABLE_TYPE(ALSARawmidiStreamPair, alsarawmidi_stream_pair, ALSARAWMIDI, STREAM_PAIR, GObject); #define ALSARAWMIDI_STREAM_PAIR_ERROR alsarawmidi_stream_pair_error_quark() GQuark alsarawmidi_stream_pair_error_quark(); -typedef struct _ALSARawmidiStreamPair ALSARawmidiStreamPair; -typedef struct _ALSARawmidiStreamPairClass ALSARawmidiStreamPairClass; -typedef struct _ALSARawmidiStreamPairPrivate ALSARawmidiStreamPairPrivate; - -struct _ALSARawmidiStreamPair { - GObject parent_instance; - - ALSARawmidiStreamPairPrivate *priv; -}; - struct _ALSARawmidiStreamPairClass { GObjectClass parent_class; @@ -65,8 +37,6 @@ struct _ALSARawmidiStreamPairClass { void (*handle_disconnection)(ALSARawmidiStreamPair *self); }; -GType alsarawmidi_stream_pair_get_type(void) G_GNUC_CONST; - ALSARawmidiStreamPair *alsarawmidi_stream_pair_new(); void alsarawmidi_stream_pair_open(ALSARawmidiStreamPair *self, guint card_id, -- 2.47.3