From 9fa9ea2162e342cc1d675115b3665a98fbf367a8 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Fri, 13 Mar 2020 18:42:38 +0100
Subject: [PATCH] flax: Use G_DECLARE_FINAL_TYPE

---
 ext/flac/gstflacdec.h | 14 +-------------
 ext/flac/gstflacenc.h | 14 +-------------
 ext/flac/gstflactag.h | 15 +--------------
 3 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/ext/flac/gstflacdec.h b/ext/flac/gstflacdec.h
index c63b300ba9..584e7dfdee 100644
--- a/ext/flac/gstflacdec.h
+++ b/ext/flac/gstflacdec.h
@@ -31,13 +31,7 @@
 G_BEGIN_DECLS
 
 #define GST_TYPE_FLAC_DEC gst_flac_dec_get_type()
-#define GST_FLAC_DEC(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_FLAC_DEC, GstFlacDec)
-#define GST_FLAC_DEC_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_FLAC_DEC, GstFlacDecClass)
-#define GST_IS_FLAC_DEC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLAC_DEC)
-#define GST_IS_FLAC_DEC_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLAC_DEC)
-
-typedef struct _GstFlacDec GstFlacDec;
-typedef struct _GstFlacDecClass GstFlacDecClass;
+G_DECLARE_FINAL_TYPE (GstFlacDec, gst_flac_dec, GST, FLAC_DEC, GstAudioDecoder)
 
 struct _GstFlacDec {
   GstAudioDecoder  audiodecoder;
@@ -63,12 +57,6 @@ struct _GstFlacDec {
   gint           error_count;
 };
 
-struct _GstFlacDecClass {
-  GstAudioDecoderClass  audiodecoder;
-};
-
-GType gst_flac_dec_get_type (void);
-
 G_END_DECLS
 
 #endif /* __GST_FLAC_DEC_H__ */
diff --git a/ext/flac/gstflacenc.h b/ext/flac/gstflacenc.h
index 11aec4e998..1447d5e6fa 100644
--- a/ext/flac/gstflacenc.h
+++ b/ext/flac/gstflacenc.h
@@ -29,13 +29,7 @@
 G_BEGIN_DECLS
 
 #define GST_TYPE_FLAC_ENC (gst_flac_enc_get_type())
-#define GST_FLAC_ENC(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_FLAC_ENC, GstFlacEnc)
-#define GST_FLAC_ENC_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_FLAC_ENC, GstFlacEncClass)
-#define GST_IS_FLAC_ENC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLAC_ENC)
-#define GST_IS_FLAC_ENC_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLAC_ENC)
-
-typedef struct _GstFlacEnc GstFlacEnc;
-typedef struct _GstFlacEncClass GstFlacEncClass;
+G_DECLARE_FINAL_TYPE (GstFlacEnc, gst_flac_enc, GST, FLAC_ENC, GstAudioEncoder)
 
 struct _GstFlacEnc {
   GstAudioEncoder  element;
@@ -69,12 +63,6 @@ struct _GstFlacEnc {
   gint             channel_reorder_map[8];
 };
 
-struct _GstFlacEncClass {
-  GstAudioEncoderClass parent_class;
-};
-
-GType gst_flac_enc_get_type(void);
-
 G_END_DECLS
 
 #endif /* __GST_FLAC_ENC_H__ */
diff --git a/ext/flac/gstflactag.h b/ext/flac/gstflactag.h
index 106541a051..b360d94c46 100644
--- a/ext/flac/gstflactag.h
+++ b/ext/flac/gstflactag.h
@@ -28,13 +28,7 @@
 #include <gst/base/gstadapter.h>
 
 #define GST_TYPE_FLAC_TAG (gst_flac_tag_get_type())
-#define GST_FLAC_TAG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FLAC_TAG, GstFlacTag))
-#define GST_FLAC_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FLAC_TAG, GstFlacTag))
-#define GST_IS_FLAC_TAG(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FLAC_TAG))
-#define GST_IS_FLAC_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FLAC_TAG))
-
-typedef struct _GstFlacTag GstFlacTag;
-typedef struct _GstFlacTagClass GstFlacTagClass;
+G_DECLARE_FINAL_TYPE (GstFlacTag, gst_flac_tag, GST, FLAC_TAG, GstElement)
 
 typedef enum
 {
@@ -68,11 +62,4 @@ struct _GstFlacTag
   gboolean metadata_last_block;
 };
 
-struct _GstFlacTagClass
-{
-  GstElementClass parent_class;
-};
-
-GType gst_flac_tag_get_type (void);
-
 #endif /* GST_FLAC_TAG_H */