summaryrefslogtreecommitdiffstats
path: root/gst-libs
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 /gst-libs
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 'gst-libs')
-rw-r--r--gst-libs/gst/mixer/mixertrack.c4
-rw-r--r--gst-libs/gst/tuner/tunerchannel.c4
-rw-r--r--gst-libs/gst/tuner/tunernorm.c4
-rw-r--r--gst-libs/gst/xwindowlistener/xwindowlistener.c1
4 files changed, 10 insertions, 3 deletions
diff --git a/gst-libs/gst/mixer/mixertrack.c b/gst-libs/gst/mixer/mixertrack.c
index ea531d5f..36ce288d 100644
--- a/gst-libs/gst/mixer/mixertrack.c
+++ b/gst-libs/gst/mixer/mixertrack.c
@@ -183,8 +183,10 @@ gst_mixer_track_dispose (GObject * object)
{
GstMixerTrack *channel = GST_MIXER_TRACK (object);
- if (channel->label)
+ if (channel->label) {
g_free (channel->label);
+ channel->label = NULL;
+ }
if (parent_class->dispose)
parent_class->dispose (object);
diff --git a/gst-libs/gst/tuner/tunerchannel.c b/gst-libs/gst/tuner/tunerchannel.c
index de0be2e4..1826a3e2 100644
--- a/gst-libs/gst/tuner/tunerchannel.c
+++ b/gst-libs/gst/tuner/tunerchannel.c
@@ -104,8 +104,10 @@ gst_tuner_channel_dispose (GObject * object)
{
GstTunerChannel *channel = GST_TUNER_CHANNEL (object);
- if (channel->label)
+ if (channel->label) {
g_free (channel->label);
+ channel->label = NULL;
+ }
if (parent_class->dispose)
parent_class->dispose (object);
diff --git a/gst-libs/gst/tuner/tunernorm.c b/gst-libs/gst/tuner/tunernorm.c
index 8fb98db7..2eb973de 100644
--- a/gst-libs/gst/tuner/tunernorm.c
+++ b/gst-libs/gst/tuner/tunernorm.c
@@ -88,8 +88,10 @@ gst_tuner_norm_dispose (GObject * object)
{
GstTunerNorm *norm = GST_TUNER_NORM (object);
- if (norm->label)
+ if (norm->label) {
g_free (norm->label);
+ norm->label = NULL;
+ }
if (parent_class->dispose)
parent_class->dispose (object);
diff --git a/gst-libs/gst/xwindowlistener/xwindowlistener.c b/gst-libs/gst/xwindowlistener/xwindowlistener.c
index 9963535c..ebbc9ac6 100644
--- a/gst-libs/gst/xwindowlistener/xwindowlistener.c
+++ b/gst-libs/gst/xwindowlistener/xwindowlistener.c
@@ -96,6 +96,7 @@ gst_x_window_listener_dispose (GObject * object)
if (xwin->display_name) {
g_free (xwin->display_name);
+ xwin->display_name = NULL;
}
if (parent_class->dispose) {