From 0afac375b4c2ea0e6deae8ae5d1221bb93f8f4d1 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Sat, 8 Apr 2006 21:02:53 +0000 Subject: [PATCH] Fix #337365 (g_type_class_ref <-> g_type_class_peek_parent) Original commit message from CVS: * ext/alsa/gstalsamixeroptions.c: (gst_alsa_mixer_options_class_init): * ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_class_init): * ext/ogg/gstoggdemux.c: (gst_ogg_pad_class_init): * ext/ogg/gstoggmux.c: (gst_ogg_mux_class_init): * ext/ogg/gstoggparse.c: (gst_ogg_parse_class_init): * gst-libs/gst/audio/gstaudioclock.c: (gst_audio_clock_class_init): * gst-libs/gst/audio/gstaudiofilter.c: (gst_audio_filter_class_init): * gst-libs/gst/audio/gstaudiosink.c: (gst_audioringbuffer_class_init): * gst-libs/gst/audio/gstaudiosrc.c: (gst_audioringbuffer_class_init): * gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_class_init): * gst-libs/gst/interfaces/colorbalancechannel.c: (gst_color_balance_channel_class_init): * gst-libs/gst/interfaces/mixeroptions.c: (gst_mixer_options_class_init): * gst-libs/gst/interfaces/mixertrack.c: (gst_mixer_track_class_init): * gst-libs/gst/interfaces/tunerchannel.c: (gst_tuner_channel_class_init): * gst-libs/gst/interfaces/tunernorm.c: (gst_tuner_norm_class_init): * gst-libs/gst/netbuffer/gstnetbuffer.c: (gst_netbuffer_class_init): * gst-libs/gst/rtp/gstbasertppayload.c: (gst_basertppayload_class_init): * gst/playback/gstdecodebin.c: (gst_decode_bin_class_init): * gst/playback/gstplaybasebin.c: (gst_play_base_bin_class_init): * gst/playback/gstplaybin.c: (gst_play_bin_class_init): * gst/playback/gststreaminfo.c: (gst_stream_info_class_init): * gst/playback/gststreamselector.c: (gst_stream_selector_class_init): * gst/subparse/gstsubparse.c: (gst_sub_parse_class_init): * gst/tcp/gsttcpclientsink.c: (gst_tcp_client_sink_class_init): * sys/v4l/gstv4lcolorbalance.c: (gst_v4l_color_balance_channel_class_init): * sys/v4l/gstv4ljpegsrc.c: (gst_v4ljpegsrc_class_init): * sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_class_init): * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_class_init): * sys/v4l/gstv4ltuner.c: (gst_v4l_tuner_channel_class_init), (gst_v4l_tuner_norm_class_init): * sys/ximage/ximagesink.c: (gst_ximagesink_class_init): * sys/xvimage/xvimagesink.c: (gst_xvimagesink_class_init): * tests/old/testsuite/alsa/sinesrc.c: (sinesrc_class_init): Fix #337365 (g_type_class_ref <-> g_type_class_peek_parent) --- ChangeLog | 49 +++++++++++++++++++ ext/alsa/gstalsamixeroptions.c | 3 +- ext/alsa/gstalsamixertrack.c | 3 +- ext/ogg/gstoggdemux.c | 2 +- ext/ogg/gstoggmux.c | 2 +- ext/ogg/gstoggparse.c | 2 +- gst-libs/gst/audio/gstaudioclock.c | 2 +- gst-libs/gst/audio/gstaudiofilter.c | 2 +- gst-libs/gst/audio/gstaudiosink.c | 2 +- gst-libs/gst/audio/gstaudiosrc.c | 2 +- gst-libs/gst/audio/gstringbuffer.c | 2 +- gst-libs/gst/interfaces/colorbalancechannel.c | 2 +- gst-libs/gst/interfaces/mixeroptions.c | 2 +- gst-libs/gst/interfaces/mixertrack.c | 2 +- gst-libs/gst/interfaces/tunerchannel.c | 2 +- gst-libs/gst/interfaces/tunernorm.c | 2 +- gst-libs/gst/netbuffer/gstnetbuffer.c | 2 +- gst-libs/gst/rtp/gstbasertppayload.c | 2 +- gst/playback/gstdecodebin.c | 2 +- gst/playback/gstplaybasebin.c | 2 +- gst/playback/gstplaybin.c | 2 +- gst/playback/gststreaminfo.c | 2 +- gst/playback/gststreamselector.c | 2 +- gst/subparse/gstsubparse.c | 2 +- gst/tcp/gsttcpclientsink.c | 2 +- sys/v4l/gstv4lcolorbalance.c | 2 +- sys/v4l/gstv4ljpegsrc.c | 2 +- sys/v4l/gstv4lmjpegsink.c | 2 +- sys/v4l/gstv4lmjpegsrc.c | 2 +- sys/v4l/gstv4ltuner.c | 4 +- sys/ximage/ximagesink.c | 2 +- sys/xvimage/xvimagesink.c | 2 +- tests/old/testsuite/alsa/sinesrc.c | 2 +- 33 files changed, 82 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index bee0c608cf..ec236e745a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,52 @@ +2006-04-08 Stefan Kost + + * ext/alsa/gstalsamixeroptions.c: + (gst_alsa_mixer_options_class_init): + * ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_class_init): + * ext/ogg/gstoggdemux.c: (gst_ogg_pad_class_init): + * ext/ogg/gstoggmux.c: (gst_ogg_mux_class_init): + * ext/ogg/gstoggparse.c: (gst_ogg_parse_class_init): + * gst-libs/gst/audio/gstaudioclock.c: (gst_audio_clock_class_init): + * gst-libs/gst/audio/gstaudiofilter.c: + (gst_audio_filter_class_init): + * gst-libs/gst/audio/gstaudiosink.c: + (gst_audioringbuffer_class_init): + * gst-libs/gst/audio/gstaudiosrc.c: + (gst_audioringbuffer_class_init): + * gst-libs/gst/audio/gstringbuffer.c: (gst_ring_buffer_class_init): + * gst-libs/gst/interfaces/colorbalancechannel.c: + (gst_color_balance_channel_class_init): + * gst-libs/gst/interfaces/mixeroptions.c: + (gst_mixer_options_class_init): + * gst-libs/gst/interfaces/mixertrack.c: + (gst_mixer_track_class_init): + * gst-libs/gst/interfaces/tunerchannel.c: + (gst_tuner_channel_class_init): + * gst-libs/gst/interfaces/tunernorm.c: (gst_tuner_norm_class_init): + * gst-libs/gst/netbuffer/gstnetbuffer.c: + (gst_netbuffer_class_init): + * gst-libs/gst/rtp/gstbasertppayload.c: + (gst_basertppayload_class_init): + * gst/playback/gstdecodebin.c: (gst_decode_bin_class_init): + * gst/playback/gstplaybasebin.c: (gst_play_base_bin_class_init): + * gst/playback/gstplaybin.c: (gst_play_bin_class_init): + * gst/playback/gststreaminfo.c: (gst_stream_info_class_init): + * gst/playback/gststreamselector.c: + (gst_stream_selector_class_init): + * gst/subparse/gstsubparse.c: (gst_sub_parse_class_init): + * gst/tcp/gsttcpclientsink.c: (gst_tcp_client_sink_class_init): + * sys/v4l/gstv4lcolorbalance.c: + (gst_v4l_color_balance_channel_class_init): + * sys/v4l/gstv4ljpegsrc.c: (gst_v4ljpegsrc_class_init): + * sys/v4l/gstv4lmjpegsink.c: (gst_v4lmjpegsink_class_init): + * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_class_init): + * sys/v4l/gstv4ltuner.c: (gst_v4l_tuner_channel_class_init), + (gst_v4l_tuner_norm_class_init): + * sys/ximage/ximagesink.c: (gst_ximagesink_class_init): + * sys/xvimage/xvimagesink.c: (gst_xvimagesink_class_init): + * tests/old/testsuite/alsa/sinesrc.c: (sinesrc_class_init): + Fix #337365 (g_type_class_ref <-> g_type_class_peek_parent) + 2006-04-08 Stefan Kost * ext/pango/gsttextrender.h: diff --git a/ext/alsa/gstalsamixeroptions.c b/ext/alsa/gstalsamixeroptions.c index 09ff949cda..b47c8a9445 100644 --- a/ext/alsa/gstalsamixeroptions.c +++ b/ext/alsa/gstalsamixeroptions.c @@ -58,8 +58,7 @@ gst_alsa_mixer_options_get_type (void) static void gst_alsa_mixer_options_class_init (gpointer g_class, gpointer class_data) { - if (parent_class == NULL) - parent_class = g_type_class_ref (GST_TYPE_MIXER_TRACK); + parent_class = g_type_class_peek_parent (g_class); } static void diff --git a/ext/alsa/gstalsamixertrack.c b/ext/alsa/gstalsamixertrack.c index 77f5489548..3c79f4ec34 100644 --- a/ext/alsa/gstalsamixertrack.c +++ b/ext/alsa/gstalsamixertrack.c @@ -60,8 +60,7 @@ gst_alsa_mixer_track_get_type (void) static void gst_alsa_mixer_track_class_init (gpointer g_class, gpointer class_data) { - if (parent_class == NULL) - parent_class = g_type_class_ref (GST_TYPE_MIXER_TRACK); + parent_class = g_type_class_peek_parent (g_class); } static void diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index 5666d5f35b..4fa0e57400 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -265,7 +265,7 @@ gst_ogg_pad_class_init (GstOggPadClass * klass) gobject_class = (GObjectClass *) klass; - ogg_pad_parent_class = g_type_class_ref (GST_TYPE_PAD); + ogg_pad_parent_class = g_type_class_peek_parent (klass); gobject_class->dispose = gst_ogg_pad_dispose; gobject_class->finalize = gst_ogg_pad_finalize; diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index 8268e6188b..58c58f4091 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -244,7 +244,7 @@ gst_ogg_mux_class_init (GstOggMuxClass * 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->finalize = gst_ogg_mux_finalize; gobject_class->get_property = gst_ogg_mux_get_property; diff --git a/ext/ogg/gstoggparse.c b/ext/ogg/gstoggparse.c index e3090e8960..507f82cfdc 100644 --- a/ext/ogg/gstoggparse.c +++ b/ext/ogg/gstoggparse.c @@ -232,7 +232,7 @@ gst_ogg_parse_class_init (GstOggParseClass * klass) GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gstelement_class->change_state = gst_ogg_parse_change_state; diff --git a/gst-libs/gst/audio/gstaudioclock.c b/gst-libs/gst/audio/gstaudioclock.c index 76a8d973e9..6d237e269d 100644 --- a/gst-libs/gst/audio/gstaudioclock.c +++ b/gst-libs/gst/audio/gstaudioclock.c @@ -72,7 +72,7 @@ gst_audio_clock_class_init (GstAudioClockClass * klass) gstobject_class = (GstObjectClass *) klass; gstclock_class = (GstClockClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_SYSTEM_CLOCK); + parent_class = g_type_class_peek_parent (klass); gstclock_class->get_internal_time = gst_audio_clock_get_internal_time; } diff --git a/gst-libs/gst/audio/gstaudiofilter.c b/gst-libs/gst/audio/gstaudiofilter.c index 750413bea7..177d84e7f4 100644 --- a/gst-libs/gst/audio/gstaudiofilter.c +++ b/gst-libs/gst/audio/gstaudiofilter.c @@ -105,7 +105,7 @@ gst_audio_filter_class_init (gpointer g_class, gpointer class_data) 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_audio_filter_set_property; gobject_class->get_property = gst_audio_filter_get_property; diff --git a/gst-libs/gst/audio/gstaudiosink.c b/gst-libs/gst/audio/gstaudiosink.c index 1c3a9fe16b..41560c7cdc 100644 --- a/gst-libs/gst/audio/gstaudiosink.c +++ b/gst-libs/gst/audio/gstaudiosink.c @@ -119,7 +119,7 @@ gst_audioringbuffer_class_init (GstAudioRingBufferClass * klass) gstobject_class = (GstObjectClass *) klass; gstringbuffer_class = (GstRingBufferClass *) klass; - ring_parent_class = g_type_class_ref (GST_TYPE_RING_BUFFER); + ring_parent_class = g_type_class_peek_parent (klass); gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_audioringbuffer_dispose); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_audioringbuffer_finalize); diff --git a/gst-libs/gst/audio/gstaudiosrc.c b/gst-libs/gst/audio/gstaudiosrc.c index ec33d1238f..7c15a0e8c9 100644 --- a/gst-libs/gst/audio/gstaudiosrc.c +++ b/gst-libs/gst/audio/gstaudiosrc.c @@ -118,7 +118,7 @@ gst_audioringbuffer_class_init (GstAudioRingBufferClass * klass) gstobject_class = (GstObjectClass *) klass; gstringbuffer_class = (GstRingBufferClass *) klass; - ring_parent_class = g_type_class_ref (GST_TYPE_RING_BUFFER); + ring_parent_class = g_type_class_peek_parent (klass); gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_audioringbuffer_dispose); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_audioringbuffer_finalize); diff --git a/gst-libs/gst/audio/gstringbuffer.c b/gst-libs/gst/audio/gstringbuffer.c index 5abede7ef3..34067e1c19 100644 --- a/gst-libs/gst/audio/gstringbuffer.c +++ b/gst-libs/gst/audio/gstringbuffer.c @@ -94,7 +94,7 @@ gst_ring_buffer_class_init (GstRingBufferClass * klass) gobject_class = (GObjectClass *) klass; gstobject_class = (GstObjectClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_OBJECT); + parent_class = g_type_class_peek_parent (klass); gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_ring_buffer_dispose); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_ring_buffer_finalize); diff --git a/gst-libs/gst/interfaces/colorbalancechannel.c b/gst-libs/gst/interfaces/colorbalancechannel.c index 4fd0ea8887..e99fe00386 100644 --- a/gst-libs/gst/interfaces/colorbalancechannel.c +++ b/gst-libs/gst/interfaces/colorbalancechannel.c @@ -72,7 +72,7 @@ gst_color_balance_channel_class_init (GstColorBalanceChannelClass * klass) { GObjectClass *object_klass = (GObjectClass *) klass; - parent_class = g_type_class_ref (G_TYPE_OBJECT); + parent_class = g_type_class_peek_parent (klass); signals[SIGNAL_VALUE_CHANGED] = g_signal_new ("value-changed", G_TYPE_FROM_CLASS (klass), diff --git a/gst-libs/gst/interfaces/mixeroptions.c b/gst-libs/gst/interfaces/mixeroptions.c index 3b0e24c828..7c5c836b43 100644 --- a/gst-libs/gst/interfaces/mixeroptions.c +++ b/gst-libs/gst/interfaces/mixeroptions.c @@ -71,7 +71,7 @@ gst_mixer_options_class_init (GstMixerOptionsClass * klass) { GObjectClass *object_klass = (GObjectClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_MIXER_TRACK); + parent_class = g_type_class_peek_parent (klass); signals[SIGNAL_OPTION_CHANGED] = g_signal_new ("option_changed", G_TYPE_FROM_CLASS (klass), diff --git a/gst-libs/gst/interfaces/mixertrack.c b/gst-libs/gst/interfaces/mixertrack.c index 36ce288d4a..4d8e971150 100644 --- a/gst-libs/gst/interfaces/mixertrack.c +++ b/gst-libs/gst/interfaces/mixertrack.c @@ -86,7 +86,7 @@ gst_mixer_track_class_init (GstMixerTrackClass * klass) { GObjectClass *object_klass = G_OBJECT_CLASS (klass); - parent_class = g_type_class_ref (G_TYPE_OBJECT); + parent_class = g_type_class_peek_parent (klass); object_klass->get_property = gst_mixer_track_get_property; diff --git a/gst-libs/gst/interfaces/tunerchannel.c b/gst-libs/gst/interfaces/tunerchannel.c index 1826a3e27b..ff6b0bc876 100644 --- a/gst-libs/gst/interfaces/tunerchannel.c +++ b/gst-libs/gst/interfaces/tunerchannel.c @@ -72,7 +72,7 @@ gst_tuner_channel_class_init (GstTunerChannelClass * klass) { GObjectClass *object_klass = (GObjectClass *) klass; - parent_class = g_type_class_ref (G_TYPE_OBJECT); + parent_class = g_type_class_peek_parent (klass); signals[SIGNAL_FREQUENCY_CHANGED] = g_signal_new ("frequency-changed", G_TYPE_FROM_CLASS (klass), diff --git a/gst-libs/gst/interfaces/tunernorm.c b/gst-libs/gst/interfaces/tunernorm.c index fd3535cba8..9e10cf26c7 100644 --- a/gst-libs/gst/interfaces/tunernorm.c +++ b/gst-libs/gst/interfaces/tunernorm.c @@ -71,7 +71,7 @@ gst_tuner_norm_class_init (GstTunerNormClass * klass) { GObjectClass *object_klass = (GObjectClass *) klass; - parent_class = g_type_class_ref (G_TYPE_OBJECT); + parent_class = g_type_class_peek_parent (klass); object_klass->dispose = gst_tuner_norm_dispose; } diff --git a/gst-libs/gst/netbuffer/gstnetbuffer.c b/gst-libs/gst/netbuffer/gstnetbuffer.c index 6c73f8144f..70263affae 100644 --- a/gst-libs/gst/netbuffer/gstnetbuffer.c +++ b/gst-libs/gst/netbuffer/gstnetbuffer.c @@ -58,7 +58,7 @@ gst_netbuffer_class_init (gpointer g_class, gpointer class_data) { GstMiniObjectClass *mo_class = GST_MINI_OBJECT_CLASS (g_class); - parent_class = g_type_class_ref (GST_TYPE_BUFFER); + parent_class = g_type_class_peek_parent (g_class); mo_class->copy = (GstMiniObjectCopyFunction) gst_netbuffer_copy; mo_class->finalize = (GstMiniObjectFinalizeFunction) gst_netbuffer_finalize; diff --git a/gst-libs/gst/rtp/gstbasertppayload.c b/gst-libs/gst/rtp/gstbasertppayload.c index 9b3018098b..0e49fa2c58 100644 --- a/gst-libs/gst/rtp/gstbasertppayload.c +++ b/gst-libs/gst/rtp/gstbasertppayload.c @@ -112,7 +112,7 @@ gst_basertppayload_class_init (GstBaseRTPPayloadClass * 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->finalize = gst_basertppayload_finalize; diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c index c86b98aec9..580c1f9ce8 100644 --- a/gst/playback/gstdecodebin.c +++ b/gst/playback/gstdecodebin.c @@ -187,7 +187,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * 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); gst_decode_bin_signals[SIGNAL_NEW_DECODED_PAD] = g_signal_new ("new-decoded-pad", G_TYPE_FROM_CLASS (klass), diff --git a/gst/playback/gstplaybasebin.c b/gst/playback/gstplaybasebin.c index e1cc6394fb..f1875242b3 100644 --- a/gst/playback/gstplaybasebin.c +++ b/gst/playback/gstplaybasebin.c @@ -136,7 +136,7 @@ gst_play_base_bin_class_init (GstPlayBaseBinClass * klass) gstelement_klass = (GstElementClass *) klass; gstbin_klass = (GstBinClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_PIPELINE); + parent_class = g_type_class_peek_parent (klass); gobject_klass->set_property = gst_play_base_bin_set_property; gobject_klass->get_property = gst_play_base_bin_get_property; diff --git a/gst/playback/gstplaybin.c b/gst/playback/gstplaybin.c index f28379e14f..d6336b78dd 100644 --- a/gst/playback/gstplaybin.c +++ b/gst/playback/gstplaybin.c @@ -173,7 +173,7 @@ gst_play_bin_class_init (GstPlayBinClass * klass) gstbin_klass = (GstBinClass *) klass; playbasebin_klass = (GstPlayBaseBinClass *) klass; - parent_class = g_type_class_ref (gst_play_base_bin_get_type ()); + parent_class = g_type_class_peek_parent (klass); gobject_klass->set_property = gst_play_bin_set_property; gobject_klass->get_property = gst_play_bin_get_property; diff --git a/gst/playback/gststreaminfo.c b/gst/playback/gststreaminfo.c index 45628052a9..b85491a804 100644 --- a/gst/playback/gststreaminfo.c +++ b/gst/playback/gststreaminfo.c @@ -120,7 +120,7 @@ gst_stream_info_class_init (GstStreamInfoClass * klass) gobject_klass = (GObjectClass *) klass; - parent_class = g_type_class_ref (G_TYPE_OBJECT); + parent_class = g_type_class_peek_parent (klass); gobject_klass->set_property = gst_stream_info_set_property; gobject_klass->get_property = gst_stream_info_get_property; diff --git a/gst/playback/gststreamselector.c b/gst/playback/gststreamselector.c index 939722636a..3aac714162 100644 --- a/gst/playback/gststreamselector.c +++ b/gst/playback/gststreamselector.c @@ -129,7 +129,7 @@ gst_stream_selector_class_init (GstStreamSelectorClass * klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_stream_selector_set_property); diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c index bd48e07a29..36481a44e0 100644 --- a/gst/subparse/gstsubparse.c +++ b/gst/subparse/gstsubparse.c @@ -124,7 +124,7 @@ gst_sub_parse_class_init (GstSubParseClass * 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->dispose = gst_sub_parse_dispose; diff --git a/gst/tcp/gsttcpclientsink.c b/gst/tcp/gsttcpclientsink.c index b6b3c1a077..94bbc65cad 100644 --- a/gst/tcp/gsttcpclientsink.c +++ b/gst/tcp/gsttcpclientsink.c @@ -130,7 +130,7 @@ gst_tcp_client_sink_class_init (GstTCPClientSink * klass) gstelement_class = (GstElementClass *) klass; gstbasesink_class = (GstBaseSinkClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_BASE_SINK); + parent_class = g_type_class_peek_parent (klass); gobject_class->set_property = gst_tcp_client_sink_set_property; gobject_class->get_property = gst_tcp_client_sink_get_property; diff --git a/sys/v4l/gstv4lcolorbalance.c b/sys/v4l/gstv4lcolorbalance.c index d815c10be0..35745bb57a 100644 --- a/sys/v4l/gstv4lcolorbalance.c +++ b/sys/v4l/gstv4lcolorbalance.c @@ -74,7 +74,7 @@ static void gst_v4l_color_balance_channel_class_init (GstV4lColorBalanceChannelClass * klass) { - parent_class = g_type_class_ref (GST_TYPE_COLOR_BALANCE_CHANNEL); + parent_class = g_type_class_peek_parent (klass); } static void diff --git a/sys/v4l/gstv4ljpegsrc.c b/sys/v4l/gstv4ljpegsrc.c index e414c66aa4..8236c26c3d 100644 --- a/sys/v4l/gstv4ljpegsrc.c +++ b/sys/v4l/gstv4ljpegsrc.c @@ -91,7 +91,7 @@ gst_v4ljpegsrc_base_init (gpointer g_class) static void gst_v4ljpegsrc_class_init (GstV4lJpegSrcClass * klass) { - parent_class = g_type_class_ref (GST_TYPE_V4LSRC); + parent_class = g_type_class_peek_parent (klass); } static void diff --git a/sys/v4l/gstv4lmjpegsink.c b/sys/v4l/gstv4lmjpegsink.c index 38e33a4f3b..36113a0290 100644 --- a/sys/v4l/gstv4lmjpegsink.c +++ b/sys/v4l/gstv4lmjpegsink.c @@ -131,7 +131,7 @@ gst_v4lmjpegsink_class_init (GstV4lMjpegSinkClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_V4LELEMENT); + parent_class = g_type_class_peek_parent (klass); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUMBUFS, g_param_spec_int ("num-buffers", "num-buffers", "num-buffers", diff --git a/sys/v4l/gstv4lmjpegsrc.c b/sys/v4l/gstv4lmjpegsrc.c index 661f30bfd1..2d1797879a 100644 --- a/sys/v4l/gstv4lmjpegsrc.c +++ b/sys/v4l/gstv4lmjpegsrc.c @@ -160,7 +160,7 @@ gst_v4lmjpegsrc_class_init (GstV4lMjpegSrcClass * klass) gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_V4LELEMENT); + parent_class = g_type_class_peek_parent (klass); #if 0 g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_X_OFFSET, diff --git a/sys/v4l/gstv4ltuner.c b/sys/v4l/gstv4ltuner.c index 2337eba682..8f432b4b07 100644 --- a/sys/v4l/gstv4ltuner.c +++ b/sys/v4l/gstv4ltuner.c @@ -85,7 +85,7 @@ gst_v4l_tuner_channel_get_type (void) static void gst_v4l_tuner_channel_class_init (GstV4lTunerChannelClass * klass) { - channel_parent_class = g_type_class_ref (GST_TYPE_TUNER_CHANNEL); + channel_parent_class = g_type_class_peek_parent (klass); } static void @@ -126,7 +126,7 @@ gst_v4l_tuner_norm_get_type (void) static void gst_v4l_tuner_norm_class_init (GstV4lTunerNormClass * klass) { - norm_parent_class = g_type_class_ref (GST_TYPE_TUNER_NORM); + norm_parent_class = g_type_class_peek_parent (klass); } static void diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index cea4edb56d..959e328582 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -1920,7 +1920,7 @@ gst_ximagesink_class_init (GstXImageSinkClass * 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_ximagesink_finalize; gobject_class->set_property = gst_ximagesink_set_property; diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index c0e8c40c98..44a1fa5ca0 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -2458,7 +2458,7 @@ gst_xvimagesink_class_init (GstXvImageSinkClass * 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->set_property = gst_xvimagesink_set_property; gobject_class->get_property = gst_xvimagesink_get_property; diff --git a/tests/old/testsuite/alsa/sinesrc.c b/tests/old/testsuite/alsa/sinesrc.c index f0f5d86122..f684aaecad 100644 --- a/tests/old/testsuite/alsa/sinesrc.c +++ b/tests/old/testsuite/alsa/sinesrc.c @@ -76,7 +76,7 @@ sinesrc_class_init (SineSrcClass * klass) element_class->change_state = sinesrc_change_state; - parent_class = g_type_class_ref (GST_TYPE_ELEMENT); + parent_class = g_type_class_peek_parent (klass); } static void