From 172eaade07a24a9ab3f2dfc4750e1add05c02852 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 --- sys/cdrom/gstcdplayer.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'sys/cdrom') 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 -- cgit v1.2.1