From: Niels De Graef Date: Thu, 12 Mar 2020 07:02:02 +0000 (+0100) Subject: gio: Use G_DECLARE_FINAL_TYPE X-Git-Tag: 1.19.3~511^2~731 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29b8a64b7eee7ed2ac389f95faa9d33e9883b2bf;p=platform%2Fupstream%2Fgstreamer.git gio: Use G_DECLARE_FINAL_TYPE --- diff --git a/gst/gio/gstgiobasesink.h b/gst/gio/gstgiobasesink.h index 675490d..7ab4968 100644 --- a/gst/gio/gstgiobasesink.h +++ b/gst/gio/gstgiobasesink.h @@ -66,6 +66,8 @@ struct _GstGioBaseSinkClass GType gst_gio_base_sink_get_type (void); +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstGioBaseSink, gst_object_unref) + G_END_DECLS #endif /* __GST_GIO_BASE_SINK_H__ */ diff --git a/gst/gio/gstgiobasesrc.h b/gst/gio/gstgiobasesrc.h index a0f5598..153bb98 100644 --- a/gst/gio/gstgiobasesrc.h +++ b/gst/gio/gstgiobasesrc.h @@ -67,6 +67,8 @@ struct _GstGioBaseSrcClass GType gst_gio_base_src_get_type (void); +G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstGioBaseSrc, gst_object_unref) + G_END_DECLS #endif /* __GST_GIO_BASE_SRC_H__ */ diff --git a/gst/gio/gstgiosink.h b/gst/gio/gstgiosink.h index c4520db..671cd57 100644 --- a/gst/gio/gstgiosink.h +++ b/gst/gio/gstgiosink.h @@ -29,19 +29,8 @@ G_BEGIN_DECLS -#define GST_TYPE_GIO_SINK \ - (gst_gio_sink_get_type()) -#define GST_GIO_SINK(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GIO_SINK,GstGioSink)) -#define GST_GIO_SINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GIO_SINK,GstGioSinkClass)) -#define GST_IS_GIO_SINK(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GIO_SINK)) -#define GST_IS_GIO_SINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GIO_SINK)) - -typedef struct _GstGioSink GstGioSink; -typedef struct _GstGioSinkClass GstGioSinkClass; +#define GST_TYPE_GIO_SINK (gst_gio_sink_get_type()) +G_DECLARE_FINAL_TYPE (GstGioSink, gst_gio_sink, GST, GIO_SINK, GstGioBaseSink) /** * GstGioSink: @@ -56,13 +45,6 @@ struct _GstGioSink GFile *file; }; -struct _GstGioSinkClass -{ - GstGioBaseSinkClass parent_class; -}; - -GType gst_gio_sink_get_type (void); - G_END_DECLS #endif /* __GST_GIO_SINK_H__ */ diff --git a/gst/gio/gstgiosrc.h b/gst/gio/gstgiosrc.h index 97f351d..c6af239 100644 --- a/gst/gio/gstgiosrc.h +++ b/gst/gio/gstgiosrc.h @@ -29,19 +29,8 @@ G_BEGIN_DECLS -#define GST_TYPE_GIO_SRC \ - (gst_gio_src_get_type()) -#define GST_GIO_SRC(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GIO_SRC,GstGioSrc)) -#define GST_GIO_SRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GIO_SRC,GstGioSrcClass)) -#define GST_IS_GIO_SRC(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GIO_SRC)) -#define GST_IS_GIO_SRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GIO_SRC)) - -typedef struct _GstGioSrc GstGioSrc; -typedef struct _GstGioSrcClass GstGioSrcClass; +#define GST_TYPE_GIO_SRC (gst_gio_src_get_type()) +G_DECLARE_FINAL_TYPE (GstGioSrc, gst_gio_src, GST, GIO_SRC, GstGioBaseSrc) /** * GstGioSrc: @@ -56,13 +45,6 @@ struct _GstGioSrc GFile *file; }; -struct _GstGioSrcClass -{ - GstGioBaseSrcClass parent_class; -}; - -GType gst_gio_src_get_type (void); - G_END_DECLS #endif /* __GST_GIO_SRC_H__ */ diff --git a/gst/gio/gstgiostreamsink.h b/gst/gio/gstgiostreamsink.h index 3bddc45..8b41b07 100644 --- a/gst/gio/gstgiostreamsink.h +++ b/gst/gio/gstgiostreamsink.h @@ -29,19 +29,9 @@ G_BEGIN_DECLS -#define GST_TYPE_GIO_STREAM_SINK \ - (gst_gio_stream_sink_get_type()) -#define GST_GIO_STREAM_SINK(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GIO_STREAM_SINK,GstGioStreamSink)) -#define GST_GIO_STREAM_SINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GIO_STREAM_SINK,GstGioStreamSinkClass)) -#define GST_IS_GIO_STREAM_SINK(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GIO_STREAM_SINK)) -#define GST_IS_GIO_STREAM_SINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GIO_STREAM_SINK)) - -typedef struct _GstGioStreamSink GstGioStreamSink; -typedef struct _GstGioStreamSinkClass GstGioStreamSinkClass; +#define GST_TYPE_GIO_STREAM_SINK (gst_gio_stream_sink_get_type()) +G_DECLARE_FINAL_TYPE (GstGioStreamSink, gst_gio_stream_sink, + GST, GIO_STREAM_SINK, GstGioBaseSink) /** * GstGioStreamSink: @@ -51,18 +41,11 @@ typedef struct _GstGioStreamSinkClass GstGioStreamSinkClass; struct _GstGioStreamSink { GstGioBaseSink sink; - + /* < private > */ GOutputStream *stream; }; -struct _GstGioStreamSinkClass -{ - GstGioBaseSinkClass parent_class; -}; - -GType gst_gio_stream_sink_get_type (void); - G_END_DECLS #endif /* __GST_GIO_STREAM_SINK_H__ */ diff --git a/gst/gio/gstgiostreamsrc.h b/gst/gio/gstgiostreamsrc.h index 3b95423..5968de6 100644 --- a/gst/gio/gstgiostreamsrc.h +++ b/gst/gio/gstgiostreamsrc.h @@ -29,19 +29,9 @@ G_BEGIN_DECLS -#define GST_TYPE_GIO_STREAM_SRC \ - (gst_gio_stream_src_get_type()) -#define GST_GIO_STREAM_SRC(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GIO_STREAM_SRC,GstGioStreamSrc)) -#define GST_GIO_STREAM_SRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GIO_STREAM_SRC,GstGioStreamSrcClass)) -#define GST_IS_GIO_STREAM_SRC(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GIO_STREAM_SRC)) -#define GST_IS_GIO_STREAM_SRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GIO_STREAM_SRC)) - -typedef struct _GstGioStreamSrc GstGioStreamSrc; -typedef struct _GstGioStreamSrcClass GstGioStreamSrcClass; +#define GST_TYPE_GIO_STREAM_SRC (gst_gio_stream_src_get_type()) +G_DECLARE_FINAL_TYPE (GstGioStreamSrc, gst_gio_stream_src, + GST, GIO_STREAM_SRC, GstGioBaseSrc) /** * GstGioStreamSrc: @@ -56,13 +46,6 @@ struct _GstGioStreamSrc GInputStream *stream; }; -struct _GstGioStreamSrcClass -{ - GstGioBaseSrcClass parent_class; -}; - -GType gst_gio_stream_src_get_type (void); - G_END_DECLS #endif /* __GST_GIO_STREAM_SRC_H__ */