From d62d8d9feaf027ffa359be07fa4b400da3648940 Mon Sep 17 00:00:00 2001 From: Sebastian Dröge Date: Tue, 12 Feb 2008 12:22:48 +0000 Subject: sys/directdraw/gstdirectdrawsink.c: Properly chain up finalize functions. Fixes bug #515980. Original commit message from CVS: * sys/directdraw/gstdirectdrawsink.c: (gst_ddrawsurface_class_init), (gst_ddrawsurface_finalize), (gst_directdraw_sink_finalize): Properly chain up finalize functions. Fixes bug #515980. --- ChangeLog | 7 +++++++ common | 2 +- sys/directdraw/gstdirectdrawsink.c | 9 ++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe45ee12..dac00948 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-12 Sebastian Dröge + + * sys/directdraw/gstdirectdrawsink.c: + (gst_ddrawsurface_class_init), (gst_ddrawsurface_finalize), + (gst_directdraw_sink_finalize): + Properly chain up finalize functions. Fixes bug #515980. + 2008-02-12 Sebastian Dröge * sys/v4l2/v4l2src_calls.c: (gst_v4l2_buffer_finalize), diff --git a/common b/common index 05a617c9..2a19465f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 05a617c9043ddb78f8578195b18c166d7e1d4c2e +Subproject commit 2a19465fdb43a75f4d32950fd2beb1beb950eec2 diff --git a/sys/directdraw/gstdirectdrawsink.c b/sys/directdraw/gstdirectdrawsink.c index 9a028287..1dd334c2 100644 --- a/sys/directdraw/gstdirectdrawsink.c +++ b/sys/directdraw/gstdirectdrawsink.c @@ -214,6 +214,7 @@ gst_directdraw_sink_init_interfaces (GType type) /* Subclass of GstBuffer which manages buffer_pool surfaces lifetime */ static void gst_ddrawsurface_finalize (GstMiniObject * mini_object); +static GstBufferClass *ddrawsurface_parent_class = NULL; static void gst_ddrawsurface_init (GstDDrawSurface * surface, gpointer g_class) @@ -232,6 +233,8 @@ gst_ddrawsurface_class_init (gpointer g_class, gpointer class_data) { GstMiniObjectClass *mini_object_class = GST_MINI_OBJECT_CLASS (g_class); + ddrawsurface_parent_class = g_type_class_peek_parent (g_class); + mini_object_class->finalize = GST_DEBUG_FUNCPTR (gst_ddrawsurface_finalize); } @@ -283,7 +286,7 @@ gst_ddrawsurface_finalize (GstMiniObject * mini_object) surface->width, surface->height, ddrawsink->video_width, ddrawsink->video_height); gst_directdraw_sink_surface_destroy (ddrawsink, surface); - + GST_MINI_OBJECT_CLASS (ddrawsurface_parent_class)->finalize (mini_object); } else { /* In that case we can reuse the image and add it to our image pool. */ GST_CAT_INFO_OBJECT (directdrawsink_debug, ddrawsink, @@ -296,10 +299,12 @@ gst_ddrawsurface_finalize (GstMiniObject * mini_object) ddrawsink->buffer_pool = g_slist_prepend (ddrawsink->buffer_pool, surface); g_mutex_unlock (ddrawsink->pool_lock); } + return; no_sink: GST_CAT_WARNING (directdrawsink_debug, "no sink found"); + GST_MINI_OBJECT_CLASS (ddrawsurface_parent_class)->finalize (mini_object); return; } @@ -407,6 +412,8 @@ gst_directdraw_sink_finalize (GObject * object) if (ddrawsink->setup) { gst_directdraw_sink_cleanup (ddrawsink); } + + G_OBJECT_CLASS (parent_class)->finalize (object); } static void -- cgit