From b7d123f1bd84b5b459b56f6ef1bfd606e86d5476 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Thu, 12 Mar 2020 07:51:24 +0100
Subject: [PATCH] adder: Use G_DECLARE_FINAL_TYPE

---
 gst/adder/gstadder.h | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/gst/adder/gstadder.h b/gst/adder/gstadder.h
index a6a0c5eb75..369209cbdb 100644
--- a/gst/adder/gstadder.h
+++ b/gst/adder/gstadder.h
@@ -29,17 +29,8 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_ADDER            (gst_adder_get_type())
-#define GST_ADDER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ADDER,GstAdder))
-#define GST_IS_ADDER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ADDER))
-#define GST_ADDER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass) ,GST_TYPE_ADDER,GstAdderClass))
-#define GST_IS_ADDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) ,GST_TYPE_ADDER))
-
-typedef struct _GstAdder             GstAdder;
-typedef struct _GstAdderClass        GstAdderClass;
-
-typedef struct _GstAdderPad GstAdderPad;
-typedef struct _GstAdderPadClass GstAdderPadClass;
+#define GST_TYPE_ADDER (gst_adder_get_type())
+G_DECLARE_FINAL_TYPE (GstAdder, gst_adder, GST, ADDER, GstElement)
 
 /**
  * GstAdder:
@@ -78,18 +69,8 @@ struct _GstAdder {
   gboolean send_caps;
 };
 
-struct _GstAdderClass {
-  GstElementClass parent_class;
-};
-
-GType    gst_adder_get_type (void);
-
-#define GST_TYPE_ADDER_PAD            (gst_adder_pad_get_type())
-#define GST_ADDER_PAD(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ADDER_PAD,GstAdderPad))
-#define GST_IS_ADDER_PAD(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ADDER_PAD))
-#define GST_ADDER_PAD_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass) ,GST_TYPE_ADDER_PAD,GstAdderPadClass))
-#define GST_IS_ADDER_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass) ,GST_TYPE_ADDER_PAD))
-#define GST_ADDER_PAD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj) ,GST_TYPE_ADDER_PAD,GstAdderPadClass))
+#define GST_TYPE_ADDER_PAD (gst_adder_pad_get_type())
+G_DECLARE_FINAL_TYPE (GstAdderPad, gst_adder_pad, GST, ADDER_PAD, GstPad)
 
 struct _GstAdderPad {
   GstPad parent;
@@ -101,13 +82,6 @@ struct _GstAdderPad {
   gboolean mute;
 };
 
-struct _GstAdderPadClass {
-  GstPadClass parent_class;
-};
-
-GType gst_adder_pad_get_type (void);
-
 G_END_DECLS
 
-
 #endif /* __GST_ADDER_H__ */