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

diff --git a/src/rawmidi/substream-status.c b/src/rawmidi/substream-status.c
index a766517104f50d8592ebf5c2ecf8ef7f6cee84ed..87c1320300fcefcc1ac8f962c1334562e6d79c82 100644 (file)
--- a/src/rawmidi/substream-status.c
+++ b/src/rawmidi/substream-status.c
@@ -13,9 +13,9 @@
  *
  * The object wraps 'struct snd_rawmidi_status' in UAPI of Linux sound subsystem.
  */
-struct _ALSARawmidiSubstreamStatusPrivate {
+typedef struct {
     struct snd_rawmidi_status status;
-};
+} ALSARawmidiSubstreamStatusPrivate;
 G_DEFINE_TYPE_WITH_PRIVATE(ALSARawmidiSubstreamStatus, alsarawmidi_substream_status, G_TYPE_OBJECT)
 
 enum rawmidi_substream_status_prop_type {

diff --git a/src/rawmidi/substream-status.h b/src/rawmidi/substream-status.h
index 2cc3c138b534f77d017792e6975bd4c2ff631d17..0b984311bff93d4ec686ce762ffffd73dc17ffac 100644 (file)
--- a/src/rawmidi/substream-status.h
+++ b/src/rawmidi/substream-status.h
@@ -8,42 +8,13 @@ G_BEGIN_DECLS
 
 #define ALSARAWMIDI_TYPE_SUBSTREAM_STATUS   (alsarawmidi_substream_status_get_type())
 
-#define ALSARAWMIDI_SUBSTREAM_STATUS(obj)                           \
-    (G_TYPE_CHECK_INSTANCE_CAST((obj),                              \
-                                ALSARAWMIDI_TYPE_SUBSTREAM_STATUS,  \
-                                ALSARawmidiSubstreamStatus))
-#define ALSARAWMIDI_IS_SUBSTREAM_STATUS(obj)                        \
-    (G_TYPE_CHECK_INSTANCE_TYPE((obj),                              \
-                                ALSARAWMIDI_TYPE_SUBSTREAM_STATUS))
-
-#define ALSARAWMIDI_SUBSTREAM_STATUS_CLASS(klass)                   \
-    (G_TYPE_CHECK_CLASS_CAST((klass),                               \
-                             ALSARAWMIDI_TYPE_SUBSTREAM_STATUS,     \
-                             ALSARawmidiSubstreamStatusClass))
-#define ALSARAWMIDI_IS_SUBSTREAM_STATUS_CLASS(klass)                \
-    (G_TYPE_CHECK_CLASS_TYPE((klass),                               \
-                             ALSARAWMIDI_TYPE_SUBSTREAM_STATUS))
-#define ALSARAWMIDI_SUBSTREAM_STATUS_GET_CLASS(obj)                 \
-    (G_TYPE_INSTANCE_GET_CLASS((obj),                               \
-                               ALSARAWMIDI_TYPE_SUBSTREAM_STATUS,   \
-                               ALSARawmidiSubstreamStatusClass))
-
-typedef struct _ALSARawmidiSubstreamStatus          ALSARawmidiSubstreamStatus;
-typedef struct _ALSARawmidiSubstreamStatusClass     ALSARawmidiSubstreamStatusClass;
-typedef struct _ALSARawmidiSubstreamStatusPrivate   ALSARawmidiSubstreamStatusPrivate;
-
-struct _ALSARawmidiSubstreamStatus {
-    GObject parent_instance;
-
-    ALSARawmidiSubstreamStatusPrivate *priv;
-};
+G_DECLARE_DERIVABLE_TYPE(ALSARawmidiSubstreamStatus, alsarawmidi_substream_status, ALSARAWMIDI,
+                         SUBSTREAM_STATUS, GObject);
 
 struct _ALSARawmidiSubstreamStatusClass {
     GObjectClass parent_class;
 };
 
-GType alsarawmidi_substream_status_get_type() G_GNUC_CONST;
-
 ALSARawmidiSubstreamStatus *alsarawmidi_substream_status_new();
 
 G_END_DECLS