gtk: Use G_DECLARE_FINAL_TYPE

This commit is contained in:
Niels De Graef 2020-03-14 17:43:50 +01:00
parent e45a13ca2b
commit 9f494290d5
3 changed files with 7 additions and 44 deletions

View file

@ -89,6 +89,8 @@ struct _GstGtkBaseSinkClass
GtkWidget* (*create_widget) (void);
};
G_DEFINE_AUTOPTR_CLEANUP_FUNC (GstGtkBaseSink, gst_object_unref)
G_END_DECLS
#endif /* __GST_GTK_BASE_SINK_H__ */

View file

@ -30,19 +30,11 @@
#include "gstgtkbasesink.h"
#define GST_TYPE_GTK_GL_SINK (gst_gtk_gl_sink_get_type())
#define GST_GTK_GL_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GTK_GL_SINK,GstGtkGLSink))
#define GST_GTK_GL_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GTK_GL_SINK,GstGtkGLSinkClass))
#define GST_IS_GTK_GL_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GTK_GL_SINK))
#define GST_IS_GTK_GL_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GTK_GL_SINK))
#define GST_GTK_GL_SINK_CAST(obj) ((GstGtkGLSink*)(obj))
G_BEGIN_DECLS
typedef struct _GstGtkGLSink GstGtkGLSink;
typedef struct _GstGtkGLSinkClass GstGtkGLSinkClass;
GType gst_gtk_gl_sink_get_type (void);
#define GST_TYPE_GTK_GL_SINK (gst_gtk_gl_sink_get_type())
G_DECLARE_FINAL_TYPE (GstGtkGLSink, gst_gtk_gl_sink, GST, GTK_GL_SINK,
GstGtkBaseSink)
/**
* GstGtkGLSink:
@ -69,17 +61,6 @@ struct _GstGtkGLSink
gulong widget_destroy_sig_handler;
};
/**
* GstGtkGLSinkClass:
*
* The #GstGtkGLSinkClass struct only contains private data
*/
struct _GstGtkGLSinkClass
{
/* <private> */
GstGtkBaseSinkClass object_class;
};
G_END_DECLS
#endif /* __GST_GTK_GL_SINK_H__ */

View file

@ -28,19 +28,10 @@
#include "gstgtkbasesink.h"
#define GST_TYPE_GTK_SINK (gst_gtk_sink_get_type())
#define GST_GTK_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GTK_SINK,GstGtkSink))
#define GST_GTK_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GTK_SINK,GstGtkSinkClass))
#define GST_IS_GTK_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GTK_SINK))
#define GST_IS_GTK_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GTK_SINK))
#define GST_GTK_SINK_CAST(obj) ((GstGtkSink*)(obj))
G_BEGIN_DECLS
typedef struct _GstGtkSink GstGtkSink;
typedef struct _GstGtkSinkClass GstGtkSinkClass;
GType gst_gtk_sink_get_type (void);
#define GST_TYPE_GTK_SINK (gst_gtk_sink_get_type())
G_DECLARE_FINAL_TYPE (GstGtkSink, gst_gtk_sink, GST, GTK_SINK, GstGtkBaseSink)
/**
* GstGtkSink:
@ -53,17 +44,6 @@ struct _GstGtkSink
GstGtkBaseSink parent;
};
/**
* GstGtkSinkClass:
*
* The #GstGtkSinkClass struct only contains private data
*/
struct _GstGtkSinkClass
{
/* <private> */
GstGtkBaseSinkClass object_class;
};
G_END_DECLS
#endif /* __GST_GTK_SINK_H__ */