From: Niels De Graef Date: Thu, 12 Mar 2020 12:23:36 +0000 (+0100) Subject: subparse: Use G_DECLARE_FINAL_TYPE X-Git-Tag: 1.19.3~511^2~728 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a36730fb4497ceb8bedc2c48ac157c34399a2b9;p=platform%2Fupstream%2Fgstreamer.git subparse: Use G_DECLARE_FINAL_TYPE --- diff --git a/gst/subparse/gstssaparse.h b/gst/subparse/gstssaparse.h index c15acdc..aea239d 100644 --- a/gst/subparse/gstssaparse.h +++ b/gst/subparse/gstssaparse.h @@ -24,14 +24,8 @@ G_BEGIN_DECLS -#define GST_TYPE_SSA_PARSE (gst_ssa_parse_get_type ()) -#define GST_SSA_PARSE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SSA_PARSE, GstSsaParse)) -#define GST_SSA_PARSE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_SSA_PARSE, GstSsaParseClass)) -#define GST_IS_SSA_PARSE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SSA_PARSE)) -#define GST_IS_SSA_PARSE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SSA_PARSE)) - -typedef struct _GstSsaParse GstSsaParse; -typedef struct _GstSsaParseClass GstSsaParseClass; +#define GST_TYPE_SSA_PARSE (gst_ssa_parse_get_type ()) +G_DECLARE_FINAL_TYPE (GstSsaParse, gst_ssa_parse, GST, SSA_PARSE, GstElement) struct _GstSsaParse { GstElement element; @@ -45,12 +39,6 @@ struct _GstSsaParse { gchar *ini; }; -struct _GstSsaParseClass { - GstElementClass parent_class; -}; - -GType gst_ssa_parse_get_type (void); - G_END_DECLS #endif /* __GST_SSA_PARSE_H__ */ diff --git a/gst/subparse/gstsubparse.h b/gst/subparse/gstsubparse.h index 64aab34..41f73ac 100644 --- a/gst/subparse/gstsubparse.h +++ b/gst/subparse/gstsubparse.h @@ -29,19 +29,8 @@ GST_DEBUG_CATEGORY_EXTERN (sub_parse_debug); G_BEGIN_DECLS -#define GST_TYPE_SUBPARSE \ - (gst_sub_parse_get_type ()) -#define GST_SUBPARSE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SUBPARSE, GstSubParse)) -#define GST_SUBPARSE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_SUBPARSE, GstSubParseClass)) -#define GST_IS_SUBPARSE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SUBPARSE)) -#define GST_IS_SUBPARSE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SUBPARSE)) - -typedef struct _GstSubParse GstSubParse; -typedef struct _GstSubParseClass GstSubParseClass; +#define GST_TYPE_SUBPARSE (gst_sub_parse_get_type ()) +G_DECLARE_FINAL_TYPE (GstSubParse, gst_sub_parse, GST, SUBPARSE, GstElement) /* format enum */ typedef enum @@ -117,12 +106,6 @@ struct _GstSubParse { gint fps_n, fps_d; }; -struct _GstSubParseClass { - GstElementClass parent_class; -}; - -GType gst_sub_parse_get_type (void); - G_END_DECLS #endif /* __GST_SUBPARSE_H__ */