From aa99af6027716c05207535294673a92c89916cc4 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Sat, 8 Apr 2006 21:48:01 +0000 Subject: Fix #337365 (g_type_class_ref <-> g_type_class_peek_parent) Original commit message from CVS: * ext/amrwb/gstamrwbdec.c: (gst_amrwbdec_class_init): * ext/amrwb/gstamrwbenc.c: (gst_amrwbenc_class_init): * ext/amrwb/gstamrwbparse.c: (gst_amrwbparse_class_init): * ext/arts/gst_arts.c: (gst_arts_class_init): * ext/artsd/gstartsdsink.c: (gst_artsdsink_class_init): * ext/audiofile/gstafsink.c: (gst_afsink_class_init): * ext/audiofile/gstafsrc.c: (gst_afsrc_class_init): * ext/audioresample/gstaudioresample.c: * ext/cdaudio/gstcdaudio.c: (gst_cdaudio_class_init): * ext/directfb/dfbvideosink.c: (gst_dfbvideosink_class_init): * ext/divx/gstdivxdec.c: (gst_divxdec_class_init): * ext/hermes/gsthermescolorspace.c: (gst_hermes_colorspace_class_init): * ext/ivorbis/vorbisfile.c: (gst_ivorbisfile_class_init): * ext/jack/gstjack.c: (gst_jack_class_init): * ext/jack/gstjackbin.c: (gst_jack_bin_class_init): * ext/lcs/gstcolorspace.c: (gst_colorspace_class_init): * ext/libfame/gstlibfame.c: (gst_fameenc_class_init): * ext/musicbrainz/gsttrm.c: (gst_musicbrainz_class_init): * ext/nas/nassink.c: (gst_nassink_class_init): * ext/shout/gstshout.c: (gst_icecastsend_class_init): * ext/snapshot/gstsnapshot.c: (gst_snapshot_class_init): * ext/sndfile/gstsf.c: (gst_sf_class_init): * ext/swfdec/gstswfdec.c: (gst_swfdecbuffer_class_init), (gst_swfdec_class_init): * ext/tarkin/gsttarkindec.c: (gst_tarkindec_class_init): * ext/tarkin/gsttarkinenc.c: (gst_tarkinenc_class_init): * gst/cdxaparse/gstcdxastrip.c: (gst_cdxastrip_class_init): * gst/chart/gstchart.c: (gst_chart_class_init): * gst/colorspace/gstcolorspace.c: (gst_colorspace_class_init): * gst/deinterlace/gstdeinterlace.c: (gst_deinterlace_class_init): * gst/festival/gstfestival.c: (gst_festival_class_init): * gst/filter/gstbpwsinc.c: (gst_bpwsinc_class_init): * gst/filter/gstiir.c: (gst_iir_class_init): * gst/filter/gstlpwsinc.c: (gst_lpwsinc_class_init): * gst/librfb/gstrfbsrc.c: (gst_rfbsrc_class_init): * gst/mixmatrix/mixmatrix.c: (gst_mixmatrix_class_init): * gst/mpeg1sys/gstmpeg1systemencode.c: (gst_system_encode_class_init): * gst/mpeg1videoparse/gstmp1videoparse.c: (gst_mp1videoparse_class_init): * gst/mpeg2sub/gstmpeg2subt.c: (gst_mpeg2subt_class_init): * gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_class_init): * gst/overlay/gstoverlay.c: (gst_overlay_class_init): * gst/passthrough/gstpassthrough.c: (passthrough_class_init): * gst/playondemand/gstplayondemand.c: (play_on_demand_class_init): * gst/rtjpeg/gstrtjpegdec.c: (gst_rtjpegdec_class_init): * gst/rtjpeg/gstrtjpegenc.c: (gst_rtjpegenc_class_init): * gst/smooth/gstsmooth.c: (gst_smooth_class_init): * gst/smoothwave/gstsmoothwave.c: (gst_smoothwave_class_init): * gst/spectrum/gstspectrum.c: (gst_spectrum_class_init): * gst/stereo/gststereo.c: (gst_stereo_class_init): * gst/switch/gstswitch.c: (gst_switch_class_init): * gst/tta/gstttadec.c: (gst_tta_dec_class_init): * gst/tta/gstttaparse.c: (gst_tta_parse_class_init): * gst/vbidec/gstvbidec.c: (gst_vbidec_class_init): * gst/videocrop/gstvideocrop.c: (gst_video_crop_class_init): * gst/virtualdub/gstxsharpen.c: (gst_xsharpen_class_init): * gst/y4m/gsty4mencode.c: (gst_y4mencode_class_init): * sys/cdrom/gstcdplayer.c: (cdplayer_class_init): * sys/directsound/gstdirectsoundsink.c: (gst_directsoundsink_class_init): * sys/dxr3/dxr3audiosink.c: (dxr3audiosink_class_init): * sys/dxr3/dxr3spusink.c: (dxr3spusink_class_init): * sys/dxr3/dxr3videosink.c: (dxr3videosink_class_init): * sys/qcam/gstqcamsrc.c: (gst_qcamsrc_class_init): * sys/v4l2/gstv4l2colorbalance.c: (gst_v4l2_color_balance_channel_class_init): * sys/v4l2/gstv4l2tuner.c: (gst_v4l2_tuner_channel_class_init), (gst_v4l2_tuner_norm_class_init): * sys/ximagesrc/ximagesrc.c: (gst_ximagesrc_class_init): Fix #337365 (g_type_class_ref <-> g_type_class_peek_parent) --- ext/amrwb/gstamrwbdec.c | 2 +- ext/amrwb/gstamrwbenc.c | 2 +- ext/amrwb/gstamrwbparse.c | 2 +- ext/arts/gst_arts.c | 2 +- ext/artsd/gstartsdsink.c | 2 +- ext/audiofile/gstafsink.c | 2 +- ext/audiofile/gstafsrc.c | 2 +- ext/audioresample/gstaudioresample.c | 2 +- ext/cdaudio/gstcdaudio.c | 2 +- ext/directfb/dfbvideosink.c | 2 +- ext/divx/gstdivxdec.c | 2 +- ext/hermes/gsthermescolorspace.c | 2 +- ext/ivorbis/vorbisfile.c | 2 +- ext/jack/gstjack.c | 2 +- ext/jack/gstjackbin.c | 2 +- ext/lcs/gstcolorspace.c | 2 +- ext/libfame/gstlibfame.c | 2 +- ext/musicbrainz/gsttrm.c | 2 +- ext/nas/nassink.c | 2 +- ext/shout/gstshout.c | 2 +- ext/snapshot/gstsnapshot.c | 2 +- ext/sndfile/gstsf.c | 4 +--- ext/swfdec/gstswfdec.c | 8 ++++---- ext/tarkin/gsttarkindec.c | 2 +- ext/tarkin/gsttarkinenc.c | 2 +- 25 files changed, 28 insertions(+), 30 deletions(-) (limited to 'ext') diff --git a/ext/amrwb/gstamrwbdec.c b/ext/amrwb/gstamrwbdec.c index cba2041d..1bab9f75 100644 --- a/ext/amrwb/gstamrwbdec.c +++ b/ext/amrwb/gstamrwbdec.c @@ -81,7 +81,7 @@ gst_amrwbdec_class_init (GstAmrwbDecClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); element_class->change_state = gst_amrwbdec_state_change; } diff --git a/ext/amrwb/gstamrwbenc.c b/ext/amrwb/gstamrwbenc.c index 3ce373e6..ced5c13b 100644 --- a/ext/amrwb/gstamrwbenc.c +++ b/ext/amrwb/gstamrwbenc.c @@ -80,7 +80,7 @@ gst_amrwbenc_class_init (GstAmrwbEncClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); object_class->finalize = gst_amrwbenc_finalize; diff --git a/ext/amrwb/gstamrwbparse.c b/ext/amrwb/gstamrwbparse.c index 69b6d207..1aa954be 100644 --- a/ext/amrwb/gstamrwbparse.c +++ b/ext/amrwb/gstamrwbparse.c @@ -90,7 +90,7 @@ gst_amrwbparse_class_init (GstAmrwbParseClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); element_class->change_state = gst_amrwbparse_state_change; diff --git a/ext/arts/gst_arts.c b/ext/arts/gst_arts.c index a74952ca..bee180a6 100644 --- a/ext/arts/gst_arts.c +++ b/ext/arts/gst_arts.c @@ -131,7 +131,7 @@ gst_arts_class_init (GstARTSClass * klass) GObjectClass *gobject_class; GstElementClass *gstelement_class; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; diff --git a/ext/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c index cfc8a382..a811cf32 100644 --- a/ext/artsd/gstartsdsink.c +++ b/ext/artsd/gstartsdsink.c @@ -118,7 +118,7 @@ gst_artsdsink_class_init (GstArtsdsinkClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MUTE, g_param_spec_boolean ("mute", "mute", "mute", TRUE, G_PARAM_READWRITE)); /* CHECKME */ diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c index 97105fa5..ce6155b6 100644 --- a/ext/audiofile/gstafsink.c +++ b/ext/audiofile/gstafsink.c @@ -159,7 +159,7 @@ gst_afsink_class_init (GstAFSinkClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gst_element_class_install_std_props (GST_ELEMENT_CLASS (klass), "location", ARG_LOCATION, G_PARAM_READWRITE, NULL); diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c index 12e6b29d..5850362b 100644 --- a/ext/audiofile/gstafsrc.c +++ b/ext/audiofile/gstafsrc.c @@ -157,7 +157,7 @@ gst_afsrc_class_init (GstAFSrcClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gst_element_class_install_std_props (GST_ELEMENT_CLASS (klass), "location", ARG_LOCATION, G_PARAM_READWRITE, NULL); diff --git a/ext/audioresample/gstaudioresample.c b/ext/audioresample/gstaudioresample.c index 733cb13e..9f19f36d 100644 --- a/ext/audioresample/gstaudioresample.c +++ b/ext/audioresample/gstaudioresample.c @@ -145,7 +145,7 @@ static void gst_audioresample_class_init (AudioresampleClass * klass) g_param_spec_int ("filter_length", "filter_length", "filter_length", 0, G_MAXINT, 16, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); GST_DEBUG_CATEGORY_INIT (audioresample_debug, "audioresample", 0, "audioresample element"); diff --git a/ext/cdaudio/gstcdaudio.c b/ext/cdaudio/gstcdaudio.c index 3a87414a..dc475019 100644 --- a/ext/cdaudio/gstcdaudio.c +++ b/ext/cdaudio/gstcdaudio.c @@ -155,7 +155,7 @@ gst_cdaudio_class_init (GstCDAudioClass * klass) gstelement_klass = (GstElementClass *) klass; gstbin_klass = (GstBinClass *) klass; - parent_class = g_type_class_ref (gst_bin_get_type ()); + parent_class = g_type_class_peek_parent (klass); gobject_klass->set_property = gst_cdaudio_set_property; gobject_klass->get_property = gst_cdaudio_get_property; diff --git a/ext/directfb/dfbvideosink.c b/ext/directfb/dfbvideosink.c index 3dc6c6eb..fbbd19ce 100644 --- a/ext/directfb/dfbvideosink.c +++ b/ext/directfb/dfbvideosink.c @@ -2274,7 +2274,7 @@ gst_dfbvideosink_class_init (GstDfbVideoSinkClass * klass) gstelement_class = (GstElementClass *) klass; gstbasesink_class = (GstBaseSinkClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_VIDEO_SINK); + parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = gst_dfbvideosink_finalize; gobject_class->set_property = gst_dfbvideosink_set_property; diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c index 1c97cca4..bf722c2c 100644 --- a/ext/divx/gstdivxdec.c +++ b/ext/divx/gstdivxdec.c @@ -152,7 +152,7 @@ gst_divxdec_class_init (GstDivxDecClass * klass) GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); GObjectClass *gobject_class = (GObjectClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gstelement_class->change_state = gst_divxdec_change_state; gobject_class->dispose = gst_divxdec_dispose; diff --git a/ext/hermes/gsthermescolorspace.c b/ext/hermes/gsthermescolorspace.c index 5eb1affc..6dd08942 100644 --- a/ext/hermes/gsthermescolorspace.c +++ b/ext/hermes/gsthermescolorspace.c @@ -525,7 +525,7 @@ gst_hermes_colorspace_class_init (GstHermesColorspaceClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gobject_class->set_property = gst_hermes_colorspace_set_property; gobject_class->get_property = gst_hermes_colorspace_get_property; diff --git a/ext/ivorbis/vorbisfile.c b/ext/ivorbis/vorbisfile.c index 3b7caae2..a7781769 100644 --- a/ext/ivorbis/vorbisfile.c +++ b/ext/ivorbis/vorbisfile.c @@ -242,7 +242,7 @@ gst_ivorbisfile_class_init (IvorbisfileClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gobject_class->get_property = gst_ivorbisfile_get_property; gobject_class->set_property = gst_ivorbisfile_set_property; diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c index 1afab02a..2f6affcc 100644 --- a/ext/jack/gstjack.c +++ b/ext/jack/gstjack.c @@ -202,7 +202,7 @@ gst_jack_class_init (GstJackClass * klass) element_class = (GstElementClass *) klass; if (parent_class == NULL) - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); object_class->get_property = gst_jack_get_property; object_class->set_property = gst_jack_set_property; diff --git a/ext/jack/gstjackbin.c b/ext/jack/gstjackbin.c index 1d79b72e..7b219c70 100644 --- a/ext/jack/gstjackbin.c +++ b/ext/jack/gstjackbin.c @@ -81,7 +81,7 @@ gst_jack_bin_class_init (GstJackBinClass * klass) object_class = (GObjectClass *) klass; element_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_BIN); + parent_class = g_type_class_peek_parent (klass); element_class->change_state = gst_jack_bin_change_state; } diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c index a2a67f8b..d4ecba6d 100644 --- a/ext/lcs/gstcolorspace.c +++ b/ext/lcs/gstcolorspace.c @@ -358,7 +358,7 @@ gst_colorspace_class_init (GstColorspaceClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gobject_class->set_property = gst_colorspace_set_property; gobject_class->get_property = gst_colorspace_get_property; diff --git a/ext/libfame/gstlibfame.c b/ext/libfame/gstlibfame.c index 011c249c..1dbe9177 100644 --- a/ext/libfame/gstlibfame.c +++ b/ext/libfame/gstlibfame.c @@ -200,7 +200,7 @@ gst_fameenc_class_init (GstFameEncClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gobject_class->set_property = gst_fameenc_set_property; gobject_class->get_property = gst_fameenc_get_property; diff --git a/ext/musicbrainz/gsttrm.c b/ext/musicbrainz/gsttrm.c index f4b791e0..8e3e7fdc 100644 --- a/ext/musicbrainz/gsttrm.c +++ b/ext/musicbrainz/gsttrm.c @@ -141,7 +141,7 @@ gst_musicbrainz_class_init (GstMusicBrainzClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SIGNATURE, g_param_spec_string ("signature", "signature", "signature", diff --git a/ext/nas/nassink.c b/ext/nas/nassink.c index 5030f638..755d57b5 100644 --- a/ext/nas/nassink.c +++ b/ext/nas/nassink.c @@ -149,7 +149,7 @@ gst_nassink_class_init (GstNassinkClass * klass) gstelement_class = (GstElementClass *) klass; if (parent_class == NULL) - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gobject_class->set_property = gst_nassink_set_property; gobject_class->get_property = gst_nassink_get_property; diff --git a/ext/shout/gstshout.c b/ext/shout/gstshout.c index c98b4fc4..ac074b50 100644 --- a/ext/shout/gstshout.c +++ b/ext/shout/gstshout.c @@ -131,7 +131,7 @@ gst_icecastsend_class_init (GstIcecastSendClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_IP, g_param_spec_string ("ip", "ip", "ip", NULL, G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PORT, g_param_spec_int ("port", "port", "port", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE)); /* CHECKME */ diff --git a/ext/snapshot/gstsnapshot.c b/ext/snapshot/gstsnapshot.c index 4b89f6c1..e1183148 100644 --- a/ext/snapshot/gstsnapshot.c +++ b/ext/snapshot/gstsnapshot.c @@ -139,7 +139,7 @@ gst_snapshot_class_init (GstSnapshotClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FRAME, g_param_spec_long ("frame", "frame", "frame", diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c index de7a28c4..f44e58fa 100644 --- a/ext/sndfile/gstsf.c +++ b/ext/sndfile/gstsf.c @@ -274,9 +274,7 @@ gst_sf_class_init (GstSFClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - /* although this isn't really the parent class, that's ok; GstSF doesn't - override any methods */ - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gst_element_class_install_std_props (gstelement_class, "location", ARG_LOCATION, G_PARAM_READWRITE, NULL); diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c index 7f945e6b..632603c1 100644 --- a/ext/swfdec/gstswfdec.c +++ b/ext/swfdec/gstswfdec.c @@ -159,14 +159,14 @@ gst_swfdecbuffer_get_type (void) } static void -gst_swfdecbuffer_class_init (gpointer g_class, gpointer class_data) +gst_swfdecbuffer_class_init (gpointer klass) { - GstBufferClass *swfdecbuffer_class = GST_BUFFER_CLASS (g_class); + GstBufferClass *swfdecbuffer_class = GST_BUFFER_CLASS (klass); swfdecbuffer_class->mini_object_class.finalize = (GstMiniObjectFinalizeFunction) gst_swfdecbuffer_finalize; - buffer_parent_class = g_type_class_ref (GST_TYPE_BUFFER); + buffer_parent_class = g_type_class_peek_parent (klass); } static void @@ -234,7 +234,7 @@ gst_swfdec_class_init (GstSwfdecClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gobject_class->set_property = gst_swfdec_set_property; gobject_class->get_property = gst_swfdec_get_property; diff --git a/ext/tarkin/gsttarkindec.c b/ext/tarkin/gsttarkindec.c index 88713ae7..b8f3f6d0 100644 --- a/ext/tarkin/gsttarkindec.c +++ b/ext/tarkin/gsttarkindec.c @@ -147,7 +147,7 @@ gst_tarkindec_class_init (TarkinDecClass * klass) g_param_spec_int ("bitrate", "bitrate", "bitrate", G_MININT, G_MAXINT, 3000, G_PARAM_READWRITE)); - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gobject_class->set_property = gst_tarkindec_set_property; gobject_class->get_property = gst_tarkindec_get_property; diff --git a/ext/tarkin/gsttarkinenc.c b/ext/tarkin/gsttarkinenc.c index 2b77ec20..6980d80a 100644 --- a/ext/tarkin/gsttarkinenc.c +++ b/ext/tarkin/gsttarkinenc.c @@ -155,7 +155,7 @@ gst_tarkinenc_class_init (TarkinEncClass * klass) "Number of vanishing moments for the analysis filter", 1, 4, 2, G_PARAM_READWRITE)); - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gobject_class->set_property = gst_tarkinenc_set_property; gobject_class->get_property = gst_tarkinenc_get_property; -- cgit v1.2.1