gdk_pixbuf: Use G_DECLARE_FINAL_TYPE

This commit is contained in:
Niels De Graef 2020-03-13 18:47:49 +01:00
parent 9fa9ea2162
commit e45a13ca2b
3 changed files with 9 additions and 55 deletions

View file

@ -27,19 +27,9 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_GDK_PIXBUF_DEC \ #define GST_TYPE_GDK_PIXBUF_DEC (gst_gdk_pixbuf_dec_get_type())
(gst_gdk_pixbuf_dec_get_type()) G_DECLARE_FINAL_TYPE (GstGdkPixbufDec, gst_gdk_pixbuf_dec, GST, GDK_PIXBUF_DEC,
#define GST_GDK_PIXBUF_DEC(obj) \ GstElement)
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDK_PIXBUF_DEC,GstGdkPixbufDec))
#define GST_GDK_PIXBUF_DEC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDK_PIXBUF_DEC,GstGdkPixbufDecClass))
#define GST_IS_GDK_PIXBUF_DEC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_PIXBUF_DEC))
#define GST_IS_GDK_PIXBUF_DEC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_PIXBUF_DEC))
typedef struct _GstGdkPixbufDec GstGdkPixbufDec;
typedef struct _GstGdkPixbufDecClass GstGdkPixbufDecClass;
struct _GstGdkPixbufDec struct _GstGdkPixbufDec
{ {
@ -58,13 +48,6 @@ struct _GstGdkPixbufDec
gboolean packetized; gboolean packetized;
}; };
struct _GstGdkPixbufDecClass
{
GstElementClass parent_class;
};
GType gst_gdk_pixbuf_dec_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_GDK_PIXBUF_DEC_H__ */ #endif /* __GST_GDK_PIXBUF_DEC_H__ */

View file

@ -29,13 +29,8 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_GDK_PIXBUF_OVERLAY (gst_gdk_pixbuf_overlay_get_type()) #define GST_TYPE_GDK_PIXBUF_OVERLAY (gst_gdk_pixbuf_overlay_get_type())
#define GST_GDK_PIXBUF_OVERLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDK_PIXBUF_OVERLAY,GstGdkPixbufOverlay)) G_DECLARE_FINAL_TYPE (GstGdkPixbufOverlay, gst_gdk_pixbuf_overlay,
#define GST_GDK_PIXBUF_OVERLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDK_PIXBUF_OVERLAY,GstGdkPixbufOverlayClass)) GST, GDK_PIXBUF_OVERLAY, GstVideoFilter)
#define GST_IS_GDK_PIXBUF_OVERLAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_PIXBUF_OVERLAY))
#define GST_IS_GDK_PIXBUF_OVERLAY_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_PIXBUF_OVERLAY))
typedef struct _GstGdkPixbufOverlay GstGdkPixbufOverlay;
typedef struct _GstGdkPixbufOverlayClass GstGdkPixbufOverlayClass;
typedef enum { typedef enum {
GST_GDK_PIXBUF_POSITIONING_PIXELS_RELATIVE_TO_EDGES, GST_GDK_PIXBUF_POSITIONING_PIXELS_RELATIVE_TO_EDGES,
@ -82,13 +77,6 @@ struct _GstGdkPixbufOverlay
gboolean update_composition; gboolean update_composition;
}; };
struct _GstGdkPixbufOverlayClass
{
GstVideoFilterClass videofilter_class;
};
GType gst_gdk_pixbuf_overlay_get_type (void);
G_END_DECLS G_END_DECLS
#endif #endif

View file

@ -27,13 +27,8 @@
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#define GST_TYPE_GDK_PIXBUF_SINK (gst_gdk_pixbuf_sink_get_type()) #define GST_TYPE_GDK_PIXBUF_SINK (gst_gdk_pixbuf_sink_get_type())
#define GST_GDK_PIXBUF_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDK_PIXBUF_SINK,GstGdkPixbufSink)) G_DECLARE_FINAL_TYPE (GstGdkPixbufSink, gst_gdk_pixbuf_sink,
#define GST_GDK_PIXBUF_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDK_PIXBUF_SINK,GstGdkPixbufSinkClass)) GST, GDK_PIXBUF_SINK, GstVideoSink)
#define GST_IS_GDK_PIXBUF_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_PIXBUF_SINK))
#define GST_IS_GDK_PIXBUF_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_PIXBUF_SINK))
typedef struct _GstGdkPixbufSink GstGdkPixbufSink;
typedef struct _GstGdkPixbufSinkClass GstGdkPixbufSinkClass;
/** /**
* GstGdkPixbufSink: * GstGdkPixbufSink:
@ -59,17 +54,5 @@ struct _GstGdkPixbufSink
GdkPixbuf * last_pixbuf; GdkPixbuf * last_pixbuf;
}; };
/**
* GstGdkPixbufSinkClass:
*
* Opaque element class structure.
*/
struct _GstGdkPixbufSinkClass
{
GstVideoSinkClass basesinkclass;
};
GType gst_gdk_pixbuf_sink_get_type (void);
#endif /* GST_GDK_PIXBUF_SINK_H */ #endif /* GST_GDK_PIXBUF_SINK_H */