summaryrefslogtreecommitdiffstats
path: root/sys/glsink
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2004-11-01 14:43:38 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2004-11-01 14:43:38 +0000
commit172eaade07a24a9ab3f2dfc4750e1add05c02852 (patch)
tree8288aa7a40420470ee248308a3ecc182284a3060 /sys/glsink
parent2c3ec7b1b5947a13ffe0ee625cbe8490d8084a6a (diff)
downloadgst-plugins-bad-172eaade07a24a9ab3f2dfc4750e1add05c02852.tar.gz
gst-plugins-bad-172eaade07a24a9ab3f2dfc4750e1add05c02852.tar.bz2
gst-plugins-bad-172eaade07a24a9ab3f2dfc4750e1add05c02852.zip
Fixes a bunch of problems with finalize and dispose functions, either assumptions that dispose is only called once, o...
Original commit message from CVS: * ext/alsa/gstalsa.c: (gst_alsa_class_init), (gst_alsa_dispose), (gst_alsa_finalize): * ext/cdaudio/gstcdaudio.c: (gst_cdaudio_class_init), (gst_cdaudio_finalize): * ext/cdparanoia/gstcdparanoia.c: (cdparanoia_class_init), (cdparanoia_finalize): * ext/divx/gstdivxdec.c: (gst_divxdec_dispose): * ext/divx/gstdivxenc.c: (gst_divxenc_dispose): * ext/dvdread/dvdreadsrc.c: (dvdreadsrc_class_init), (dvdreadsrc_finalize): * ext/flac/gstflacdec.c: (gst_flacdec_class_init), (gst_flacdec_finalize): * ext/flac/gstflacenc.c: (gst_flacenc_class_init), (gst_flacenc_finalize): * ext/gnomevfs/gstgnomevfssink.c: (gst_gnomevfssink_class_init), (gst_gnomevfssink_finalize): * ext/gnomevfs/gstgnomevfssrc.c: (gst_gnomevfssrc_class_init), (gst_gnomevfssrc_finalize): * ext/libfame/gstlibfame.c: (gst_fameenc_class_init), (gst_fameenc_finalize): * ext/nas/nassink.c: (gst_nassink_class_init), (gst_nassink_finalize): * ext/sdl/sdlvideosink.c: (gst_sdlvideosink_finalize), (gst_sdlvideosink_class_init): * ext/sndfile/gstsf.c: (gst_sf_dispose): * gst-libs/gst/mixer/mixertrack.c: (gst_mixer_track_dispose): * gst-libs/gst/tuner/tunerchannel.c: (gst_tuner_channel_dispose): * gst-libs/gst/tuner/tunernorm.c: (gst_tuner_norm_dispose): * gst-libs/gst/xwindowlistener/xwindowlistener.c: (gst_x_window_listener_dispose): * gst/audioscale/gstaudioscale.c: * gst/playondemand/gstplayondemand.c: (play_on_demand_class_init), (play_on_demand_finalize): * gst/videofilter/gstvideobalance.c: (gst_videobalance_dispose): * gst/videoscale/gstvideoscale.c: (gst_videoscale_chain): * sys/cdrom/gstcdplayer.c: (cdplayer_class_init), (cdplayer_finalize): * sys/glsink/glimagesink.c: (gst_glimagesink_finalize), (gst_glimagesink_class_init): * sys/oss/gstosselement.c: (gst_osselement_class_init), (gst_osselement_finalize): * sys/oss/gstosssink.c: (gst_osssink_dispose): * sys/oss/gstosssrc.c: (gst_osssrc_dispose): * sys/v4l/gstv4lelement.c: (gst_v4lelement_dispose): Fixes a bunch of problems with finalize and dispose functions, either assumptions that dispose is only called once, or not calling the parent class dispose/finalize function
Diffstat (limited to 'sys/glsink')
-rw-r--r--sys/glsink/glimagesink.c8
1 files changed, 4 insertions, 4 deletions
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;