From 58d74f0ec507bab4186cda70590202569050ba12 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Sun, 15 Mar 2020 19:20:49 +0100
Subject: [PATCH] taglib: Use G_DECLARE_FINAL_TYPE

---
 ext/taglib/gstapev2mux.h | 21 ++-------------------
 ext/taglib/gstid3v2mux.h | 21 ++-------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/ext/taglib/gstapev2mux.h b/ext/taglib/gstapev2mux.h
index 8eceb57142..785a1c21b9 100644
--- a/ext/taglib/gstapev2mux.h
+++ b/ext/taglib/gstapev2mux.h
@@ -26,30 +26,13 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GstApev2Mux GstApev2Mux;
-typedef struct _GstApev2MuxClass GstApev2MuxClass;
+#define GST_TYPE_APEV2_MUX (gst_apev2_mux_get_type())
+G_DECLARE_FINAL_TYPE (GstApev2Mux, gst_apev2_mux, GST, APEV2_MUX, GstTagMux)
 
 struct _GstApev2Mux {
   GstTagMux  tagmux;
 };
 
-struct _GstApev2MuxClass {
-  GstTagMuxClass  tagmux_class;
-};
-
-#define GST_TYPE_APEV2_MUX \
-  (gst_apev2_mux_get_type())
-#define GST_APEV2_MUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_APEV2_MUX,GstApev2Mux))
-#define GST_APEV2_MUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_APEV2_MUX,GstApev2MuxClass))
-#define GST_IS_APEV2_MUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_APEV2_MUX))
-#define GST_IS_APEV2_MUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_APEV2_MUX))
-
-GType gst_apev2_mux_get_type (void);
-
 G_END_DECLS
 
 #endif /* GST_APEV2_MUX_H */
diff --git a/ext/taglib/gstid3v2mux.h b/ext/taglib/gstid3v2mux.h
index 36c748fc4b..ca2ad6e1dc 100644
--- a/ext/taglib/gstid3v2mux.h
+++ b/ext/taglib/gstid3v2mux.h
@@ -25,30 +25,13 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GstId3v2Mux GstId3v2Mux;
-typedef struct _GstId3v2MuxClass GstId3v2MuxClass;
+#define GST_TYPE_ID3V2_MUX (gst_id3v2_mux_get_type())
+G_DECLARE_FINAL_TYPE (GstId3v2Mux, gst_id3v2_mux, GST, ID3V2_MUX, GstTagMux)
 
 struct _GstId3v2Mux {
   GstTagMux  tagmux;
 };
 
-struct _GstId3v2MuxClass {
-  GstTagMuxClass  tagmux_class;
-};
-
-#define GST_TYPE_ID3V2_MUX \
-  (gst_id3v2_mux_get_type())
-#define GST_ID3V2_MUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ID3V2_MUX,GstId3v2Mux))
-#define GST_ID3V2_MUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ID3V2_MUX,GstId3v2MuxClass))
-#define GST_IS_ID3V2_MUX(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ID3V2_MUX))
-#define GST_IS_ID3V2_MUX_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ID3V2_MUX))
-
-GType gst_id3v2_mux_get_type (void);
-
 G_END_DECLS
 
 #endif /* GST_ID3V2_MUX_H */