Commit 857200ff authored by Matthew Waters's avatar Matthew Waters 🐨 Committed by Tim-Philipp Müller

gl: make all GObjects inherit from GstObject

Aids memory leak debugging with GST_TRACE=mem-live
parent 6c1a4e30
......@@ -374,8 +374,8 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_color_convert_debug);
#define DEBUG_INIT \
GST_DEBUG_CATEGORY_INIT (gst_gl_color_convert_debug, "glconvert", 0, "convert");
G_DEFINE_TYPE_WITH_CODE (GstGLColorConvert, gst_gl_color_convert, G_TYPE_OBJECT,
DEBUG_INIT);
G_DEFINE_TYPE_WITH_CODE (GstGLColorConvert, gst_gl_color_convert,
GST_TYPE_OBJECT, DEBUG_INIT);
static void gst_gl_color_convert_finalize (GObject * object);
#define GST_GL_COLOR_CONVERT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
......
......@@ -44,7 +44,7 @@ GType gst_gl_color_convert_get_type (void);
struct _GstGLColorConvert
{
/* <private> */
GObject parent;
GstObject parent;
GMutex lock;
......@@ -79,7 +79,7 @@ struct _GstGLColorConvert
*/
struct _GstGLColorConvertClass
{
GObjectClass object_class;
GstObjectClass object_class;
};
/**
......
......@@ -122,7 +122,7 @@ load_gles2_module (gpointer user_data)
GST_DEBUG_CATEGORY (GST_CAT_DEFAULT);
#define gst_gl_context_parent_class parent_class
G_DEFINE_ABSTRACT_TYPE (GstGLContext, gst_gl_context, G_TYPE_OBJECT);
G_DEFINE_ABSTRACT_TYPE (GstGLContext, gst_gl_context, GST_TYPE_OBJECT);
#define GST_GL_CONTEXT_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), GST_GL_TYPE_CONTEXT, GstGLContextPrivate))
......
......@@ -68,7 +68,7 @@ typedef enum
*/
struct _GstGLContext {
/*< private >*/
GObject parent;
GstObject parent;
GstGLWindow *window;
......@@ -91,7 +91,7 @@ struct _GstGLContext {
* @swap_buffers: swap the default framebuffer's front/back buffers
*/
struct _GstGLContextClass {
GObjectClass parent_class;
GstObjectClass parent_class;
guintptr (*get_gl_context) (GstGLContext *context);
GstGLAPI (*get_gl_api) (GstGLContext *context);
......
......@@ -55,7 +55,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_display_debug);
GST_DEBUG_CATEGORY_INIT (gst_gl_display_debug, "gldisplay", 0, "opengl display"); \
GST_DEBUG_CATEGORY_GET (gst_context, "GST_CONTEXT");
G_DEFINE_TYPE_WITH_CODE (GstGLDisplay, gst_gl_display, G_TYPE_OBJECT,
G_DEFINE_TYPE_WITH_CODE (GstGLDisplay, gst_gl_display, GST_TYPE_OBJECT,
DEBUG_INIT);
#define GST_GL_DISPLAY_GET_PRIVATE(o) \
......
......@@ -67,7 +67,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_download_debug);
#define DEBUG_INIT \
GST_DEBUG_CATEGORY_INIT (gst_gl_download_debug, "gldownload", 0, "download");
G_DEFINE_TYPE_WITH_CODE (GstGLDownload, gst_gl_download, G_TYPE_OBJECT,
G_DEFINE_TYPE_WITH_CODE (GstGLDownload, gst_gl_download, GST_TYPE_OBJECT,
DEBUG_INIT);
static void gst_gl_download_finalize (GObject * object);
......
......@@ -44,7 +44,7 @@ GType gst_gl_download_get_type (void);
struct _GstGLDownload
{
/* <private> */
GObject parent;
GstObject parent;
GMutex lock;
......@@ -74,7 +74,7 @@ struct _GstGLDownload
struct _GstGLDownloadClass
{
/* <private> */
GObjectClass object_class;
GstObjectClass object_class;
};
GstGLDownload * gst_gl_download_new (GstGLContext * context);
......
......@@ -115,7 +115,8 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_shader_debug);
#define DEBUG_INIT \
GST_DEBUG_CATEGORY_INIT (gst_gl_shader_debug, "glshader", 0, "shader");
G_DEFINE_TYPE_WITH_CODE (GstGLShader, gst_gl_shader, G_TYPE_OBJECT, DEBUG_INIT);
G_DEFINE_TYPE_WITH_CODE (GstGLShader, gst_gl_shader, GST_TYPE_OBJECT,
DEBUG_INIT);
static void
_cleanup_shader (GstGLContext * context, GstGLShader * shader)
......
......@@ -48,7 +48,7 @@ typedef enum {
struct _GstGLShader {
/*< private >*/
GObject parent;
GstObject parent;
GstGLContext *context;
......@@ -57,7 +57,7 @@ struct _GstGLShader {
struct _GstGLShaderClass {
/*< private >*/
GObjectClass parent_class;
GstObjectClass parent_class;
};
/* methods */
......
......@@ -92,7 +92,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_upload_debug);
#define DEBUG_INIT \
GST_DEBUG_CATEGORY_INIT (gst_gl_upload_debug, "glupload", 0, "upload");
G_DEFINE_TYPE_WITH_CODE (GstGLUpload, gst_gl_upload, G_TYPE_OBJECT, DEBUG_INIT);
G_DEFINE_TYPE_WITH_CODE (GstGLUpload, gst_gl_upload, GST_TYPE_OBJECT, DEBUG_INIT);
static void gst_gl_upload_finalize (GObject * object);
......
......@@ -44,7 +44,7 @@ GType gst_gl_upload_get_type (void);
struct _GstGLUpload
{
/* <private> */
GObject parent;
GstObject parent;
GMutex lock;
......@@ -72,7 +72,7 @@ struct _GstGLUpload
*/
struct _GstGLUploadClass
{
GObjectClass object_class;
GstObjectClass object_class;
};
GstGLUpload * gst_gl_upload_new (GstGLContext * context);
......
......@@ -72,7 +72,7 @@
GST_DEBUG_CATEGORY (GST_CAT_DEFAULT);
#define gst_gl_window_parent_class parent_class
G_DEFINE_ABSTRACT_TYPE (GstGLWindow, gst_gl_window, G_TYPE_OBJECT);
G_DEFINE_ABSTRACT_TYPE (GstGLWindow, gst_gl_window, GST_TYPE_OBJECT);
#define GST_GL_WINDOW_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), GST_GL_TYPE_WINDOW, GstGLWindowPrivate))
......
......@@ -64,7 +64,7 @@ typedef void (*GstGLWindowResizeCB) (gpointer data, guint width, guint height);
*/
struct _GstGLWindow {
/*< private >*/
GObject parent;
GstObject parent;
GMutex lock;
......@@ -109,7 +109,7 @@ struct _GstGLWindow {
* @close: close the connection to the display
*/
struct _GstGLWindowClass {
GObjectClass parent_class;
GstObjectClass parent_class;
guintptr (*get_display) (GstGLWindow *window);
void (*set_window_handle) (GstGLWindow *window, guintptr id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment