diff options
author | Jan Schmidt <thaytan@mad.scientist.com> | 2004-11-01 14:43:38 +0000 |
---|---|---|
committer | Jan Schmidt <thaytan@mad.scientist.com> | 2004-11-01 14:43:38 +0000 |
commit | 172eaade07a24a9ab3f2dfc4750e1add05c02852 (patch) | |
tree | 8288aa7a40420470ee248308a3ecc182284a3060 /gst | |
parent | 2c3ec7b1b5947a13ffe0ee625cbe8490d8084a6a (diff) | |
download | gst-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 'gst')
-rw-r--r-- | gst/playondemand/gstplayondemand.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gst/playondemand/gstplayondemand.c b/gst/playondemand/gstplayondemand.c index f9e049c0..fdfe09b5 100644 --- a/gst/playondemand/gstplayondemand.c +++ b/gst/playondemand/gstplayondemand.c @@ -74,7 +74,7 @@ static void play_on_demand_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void play_on_demand_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static void play_on_demand_dispose (GObject * object); +static void play_on_demand_finalize (GObject * object); /* GStreamer functionality */ static GstPadLinkReturn play_on_demand_pad_link (GstPad * pad, @@ -198,7 +198,7 @@ play_on_demand_class_init (GstPlayOnDemandClass * klass) gobject_class->set_property = play_on_demand_set_property; gobject_class->get_property = play_on_demand_get_property; - gobject_class->dispose = play_on_demand_dispose; + gobject_class->finalize = play_on_demand_finalize; gstelement_class->set_clock = play_on_demand_set_clock; @@ -367,15 +367,15 @@ play_on_demand_get_property (GObject * object, guint prop_id, } static void -play_on_demand_dispose (GObject * object) +play_on_demand_finalize (GObject * object) { GstPlayOnDemand *filter = GST_PLAYONDEMAND (object); - G_OBJECT_CLASS (parent_class)->dispose (object); - g_free (filter->ticks); g_free (filter->plays); g_free (filter->buffer); + + G_OBJECT_CLASS (parent_class)->finalize (object); } static GstPadLinkReturn |