From 9888ea299006bde04a8432c2d4cb7b9da7bca06a Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 1 Nov 2004 14:43:38 +0000 Subject: 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 --- ext/flac/gstflacdec.c | 8 ++++---- ext/flac/gstflacenc.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'ext') diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c index c62c883b..480b8033 100644 --- a/ext/flac/gstflacdec.c +++ b/ext/flac/gstflacdec.c @@ -56,7 +56,7 @@ enum static void gst_flacdec_base_init (gpointer g_class); static void gst_flacdec_class_init (FlacDecClass * klass); static void gst_flacdec_init (FlacDec * flacdec); -static void gst_flacdec_dispose (GObject * object); +static void gst_flacdec_finalize (GObject * object); static void gst_flacdec_loop (GstElement * element); static GstElementStateReturn gst_flacdec_change_state (GstElement * element); @@ -169,7 +169,7 @@ gst_flacdec_class_init (FlacDecClass * klass) parent_class = g_type_class_ref (GST_TYPE_ELEMENT); - gobject_class->dispose = gst_flacdec_dispose; + gobject_class->finalize = gst_flacdec_finalize; gstelement_class->change_state = gst_flacdec_change_state; } @@ -231,7 +231,7 @@ gst_flacdec_init (FlacDec * flacdec) } static void -gst_flacdec_dispose (GObject * object) +gst_flacdec_finalize (GObject * object) { FlacDec *flacdec; @@ -241,7 +241,7 @@ gst_flacdec_dispose (GObject * object) FLAC__seekable_stream_decoder_delete (flacdec->decoder); flacdec->decoder = NULL; - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (parent_class)->finalize (object); } diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index df02799c..4d3af6cb 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -67,7 +67,7 @@ enum static void gst_flacenc_base_init (gpointer g_class); static void gst_flacenc_init (FlacEnc * flacenc); static void gst_flacenc_class_init (FlacEncClass * klass); -static void gst_flacenc_dispose (GObject * object); +static void gst_flacenc_finalize (GObject * object); static GstPadLinkReturn gst_flacenc_sinkconnect (GstPad * pad, const GstCaps * caps); @@ -233,7 +233,7 @@ gst_flacenc_class_init (FlacEncClass * klass) /* we have no properties atm so this is a bit silly */ gobject_class->set_property = gst_flacenc_set_property; gobject_class->get_property = gst_flacenc_get_property; - gobject_class->dispose = gst_flacenc_dispose; + gobject_class->finalize = gst_flacenc_finalize; g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_QUALITY, g_param_spec_enum ("quality", @@ -337,13 +337,13 @@ gst_flacenc_init (FlacEnc * flacenc) } static void -gst_flacenc_dispose (GObject * object) +gst_flacenc_finalize (GObject * object) { FlacEnc *flacenc = GST_FLACENC (object); FLAC__seekable_stream_encoder_delete (flacenc->encoder); - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (parent_class)->finalize (object); } static GstPadLinkReturn -- cgit