diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/cdrom/gstcdplayer.c | 12 | ||||
| -rw-r--r-- | sys/glsink/glimagesink.c | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/sys/cdrom/gstcdplayer.c b/sys/cdrom/gstcdplayer.c index 99c55b77..bf3b37b5 100644 --- a/sys/cdrom/gstcdplayer.c +++ b/sys/cdrom/gstcdplayer.c @@ -44,7 +44,7 @@ enum static void cdplayer_base_init (gpointer g_class); static void cdplayer_class_init (CDPlayerClass * klass); static void cdplayer_init (CDPlayer * cdp); -static void cdplayer_dispose (GObject * object); +static void cdplayer_finalize (GObject * object); static void cdplayer_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * spec); @@ -110,7 +110,7 @@ cdplayer_class_init (CDPlayerClass * klass) parent_class = g_type_class_ref (gst_bin_get_type ()); - gobject_klass->dispose = GST_DEBUG_FUNCPTR (cdplayer_dispose); + gobject_klass->finalize = GST_DEBUG_FUNCPTR (cdplayer_finalize); gstelement_klass->change_state = GST_DEBUG_FUNCPTR (cdplayer_change_state); gstbin_klass->iterate = GST_DEBUG_FUNCPTR (cdplayer_iterate); @@ -235,7 +235,7 @@ cdplayer_get_property (GObject * object, guint prop_id, GValue * value, } static void -cdplayer_dispose (GObject * object) +cdplayer_finalize (GObject * object) { CDPlayer *cdp; @@ -244,11 +244,9 @@ cdplayer_dispose (GObject * object) cdp = CDPLAYER (object); g_free (cdp->device); - if (G_OBJECT_CLASS (parent_class)->dispose) { - G_OBJECT_CLASS (parent_class)->dispose (object); + if (G_OBJECT_CLASS (parent_class)->finalize) { + G_OBJECT_CLASS (parent_class)->finalize (object); } - - return; } static gboolean diff --git a/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c index b40406c5..e94bf1ae 100644 --- a/sys/glsink/glimagesink.c +++ b/sys/glsink/glimagesink.c @@ -648,7 +648,7 @@ static int attrListDouble[] = { }; /* This function get the X Display and global infos about it. Everything is - stored in our object and will be cleaned when the object is disposed. Note + stored in our object and will be cleaned when the object is finalized. Note here that caps for supported format are generated without any window or image creation */ static GstXContext * @@ -1410,7 +1410,7 @@ gst_glimagesink_get_property (GObject * object, guint prop_id, } static void -gst_glimagesink_dispose (GObject * object) +gst_glimagesink_finalize (GObject * object) { GstGLImageSink *glimagesink; @@ -1424,7 +1424,7 @@ gst_glimagesink_dispose (GObject * object) g_mutex_free (glimagesink->x_lock); g_mutex_free (glimagesink->pool_lock); - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (parent_class)->finalize (object); } static void @@ -1521,7 +1521,7 @@ gst_glimagesink_class_init (GstGLImageSinkClass * klass) gst_marshal_VOID__POINTER_OBJECT, G_TYPE_NONE, 2, GST_TYPE_BUFFER, GST_TYPE_PAD); - gobject_class->dispose = gst_glimagesink_dispose; + gobject_class->finalize = gst_glimagesink_finalize; gobject_class->set_property = gst_glimagesink_set_property; gobject_class->get_property = gst_glimagesink_get_property; |