From f16ed4a91c13f22c51fafcae664da0d2d11fbde9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 6 Jun 2010 17:52:40 +0200 Subject: [PATCH] gst: Don't use GST_DEBUG_FUNCPTR for GObject vfuncs --- gst/autodetect/gstautoaudiosink.c | 10 ++++------ gst/autodetect/gstautoaudiosrc.c | 10 ++++------ gst/autodetect/gstautovideosink.c | 11 ++++------- gst/autodetect/gstautovideosrc.c | 10 ++++------ gst/debugutils/breakmydata.c | 6 ++---- gst/debugutils/gsttaginject.c | 6 +++--- gst/debugutils/rndbuffersize.c | 8 +++----- gst/debugutils/testplugin.c | 4 ++-- gst/flv/gstflvdemux.c | 2 +- gst/rtpmanager/gstrtpjitterbuffer.c | 2 +- gst/rtpmanager/gstrtpptdemux.c | 2 +- gst/rtpmanager/gstrtpssrcdemux.c | 4 ++-- gst/videofilter/gstvideobalance.c | 2 +- gst/videomixer/videomixer.c | 2 +- 14 files changed, 33 insertions(+), 46 deletions(-) diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c index 189698c..b07ae03 100644 --- a/gst/autodetect/gstautoaudiosink.c +++ b/gst/autodetect/gstautoaudiosink.c @@ -91,13 +91,11 @@ gst_auto_audio_sink_class_init (GstAutoAudioSinkClass * klass) gobject_class = G_OBJECT_CLASS (klass); eklass = GST_ELEMENT_CLASS (klass); - gobject_class->dispose = - (GObjectFinalizeFunc) GST_DEBUG_FUNCPTR (gst_auto_audio_sink_dispose); + gobject_class->dispose = (GObjectFinalizeFunc) gst_auto_audio_sink_dispose; + gobject_class->set_property = gst_auto_audio_sink_set_property; + gobject_class->get_property = gst_auto_audio_sink_get_property; + eklass->change_state = GST_DEBUG_FUNCPTR (gst_auto_audio_sink_change_state); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_auto_audio_sink_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_auto_audio_sink_get_property); /** * GstAutoAudioSink:filter-caps diff --git a/gst/autodetect/gstautoaudiosrc.c b/gst/autodetect/gstautoaudiosrc.c index 203857b..aa8c049 100644 --- a/gst/autodetect/gstautoaudiosrc.c +++ b/gst/autodetect/gstautoaudiosrc.c @@ -93,13 +93,11 @@ gst_auto_audio_src_class_init (GstAutoAudioSrcClass * klass) gobject_class = G_OBJECT_CLASS (klass); eklass = GST_ELEMENT_CLASS (klass); - gobject_class->dispose = - (GObjectFinalizeFunc) GST_DEBUG_FUNCPTR (gst_auto_audio_src_dispose); + gobject_class->dispose = (GObjectFinalizeFunc) gst_auto_audio_src_dispose; + gobject_class->set_property = gst_auto_audio_src_set_property; + gobject_class->get_property = gst_auto_audio_src_get_property; + eklass->change_state = GST_DEBUG_FUNCPTR (gst_auto_audio_src_change_state); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_auto_audio_src_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_auto_audio_src_get_property); /** * GstAutoAudioSrc:filter-caps diff --git a/gst/autodetect/gstautovideosink.c b/gst/autodetect/gstautovideosink.c index 3f32ec8..ed34b2f 100644 --- a/gst/autodetect/gstautovideosink.c +++ b/gst/autodetect/gstautovideosink.c @@ -89,14 +89,11 @@ gst_auto_video_sink_class_init (GstAutoVideoSinkClass * klass) GstElementClass *eklass = GST_ELEMENT_CLASS (klass); gobject_class = G_OBJECT_CLASS (klass); - gobject_class->dispose = - (GObjectFinalizeFunc) GST_DEBUG_FUNCPTR (gst_auto_video_sink_dispose); - eklass->change_state = GST_DEBUG_FUNCPTR (gst_auto_video_sink_change_state); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_auto_video_sink_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_auto_video_sink_get_property); + gobject_class->dispose = (GObjectFinalizeFunc) gst_auto_video_sink_dispose; + gobject_class->set_property = gst_auto_video_sink_set_property; + gobject_class->get_property = gst_auto_video_sink_get_property; + eklass->change_state = GST_DEBUG_FUNCPTR (gst_auto_video_sink_change_state); /** * GstAutoVideoSink:filter-caps * diff --git a/gst/autodetect/gstautovideosrc.c b/gst/autodetect/gstautovideosrc.c index 94c8411..c17dbdd 100644 --- a/gst/autodetect/gstautovideosrc.c +++ b/gst/autodetect/gstautovideosrc.c @@ -91,13 +91,11 @@ gst_auto_video_src_class_init (GstAutoVideoSrcClass * klass) GstElementClass *eklass = GST_ELEMENT_CLASS (klass); gobject_class = G_OBJECT_CLASS (klass); - gobject_class->dispose = - (GObjectFinalizeFunc) GST_DEBUG_FUNCPTR (gst_auto_video_src_dispose); + gobject_class->dispose = (GObjectFinalizeFunc) gst_auto_video_src_dispose; + gobject_class->set_property = gst_auto_video_src_set_property; + gobject_class->get_property = gst_auto_video_src_get_property; + eklass->change_state = GST_DEBUG_FUNCPTR (gst_auto_video_src_change_state); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_auto_video_src_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_auto_video_src_get_property); /** * GstAutoVideoSrc:filter-caps diff --git a/gst/debugutils/breakmydata.c b/gst/debugutils/breakmydata.c index 2cba3ce..2c579f4 100644 --- a/gst/debugutils/breakmydata.c +++ b/gst/debugutils/breakmydata.c @@ -129,10 +129,8 @@ gst_break_my_data_class_init (GstBreakMyDataClass * klass) gobject_class = G_OBJECT_CLASS (klass); gstbasetrans_class = GST_BASE_TRANSFORM_CLASS (klass); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_break_my_data_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_break_my_data_get_property); + gobject_class->set_property = gst_break_my_data_set_property; + gobject_class->get_property = gst_break_my_data_get_property; g_object_class_install_property (gobject_class, ARG_SEED, g_param_spec_uint ("seed", "seed", diff --git a/gst/debugutils/gsttaginject.c b/gst/debugutils/gsttaginject.c index 03b0e23..9197ad5 100644 --- a/gst/debugutils/gsttaginject.c +++ b/gst/debugutils/gsttaginject.c @@ -115,15 +115,15 @@ gst_tag_inject_class_init (GstTagInjectClass * klass) gobject_class = G_OBJECT_CLASS (klass); gstbasetrans_class = GST_BASE_TRANSFORM_CLASS (klass); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_tag_inject_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_tag_inject_get_property); + gobject_class->set_property = gst_tag_inject_set_property; + gobject_class->get_property = gst_tag_inject_get_property; g_object_class_install_property (gobject_class, PROP_TAGS, g_param_spec_string ("tags", "taglist", "List of tags to inject into the target file", NULL, G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS)); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_tag_inject_finalize); + gobject_class->finalize = gst_tag_inject_finalize; gstbasetrans_class->transform_ip = GST_DEBUG_FUNCPTR (gst_tag_inject_transform_ip); diff --git a/gst/debugutils/rndbuffersize.c b/gst/debugutils/rndbuffersize.c index 853642b..b389786 100644 --- a/gst/debugutils/rndbuffersize.c +++ b/gst/debugutils/rndbuffersize.c @@ -123,11 +123,9 @@ gst_rnd_buffer_size_class_init (GstRndBufferSizeClass * klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_rnd_buffer_size_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_rnd_buffer_size_get_property); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_rnd_buffer_size_finalize); + gobject_class->set_property = gst_rnd_buffer_size_set_property; + gobject_class->get_property = gst_rnd_buffer_size_get_property; + gobject_class->finalize = gst_rnd_buffer_size_finalize; gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_rnd_buffer_size_change_state); diff --git a/gst/debugutils/testplugin.c b/gst/debugutils/testplugin.c index 120b222..51be3aa 100644 --- a/gst/debugutils/testplugin.c +++ b/gst/debugutils/testplugin.c @@ -108,8 +108,8 @@ gst_test_class_init (GstTestClass * klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); guint i; - object_class->set_property = GST_DEBUG_FUNCPTR (gst_test_set_property); - object_class->get_property = GST_DEBUG_FUNCPTR (gst_test_get_property); + object_class->set_property = gst_test_set_property; + object_class->get_property = gst_test_get_property; object_class->finalize = (GObjectFinalizeFunc) gst_test_finalize; diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c index 69876c9..492877a 100644 --- a/gst/flv/gstflvdemux.c +++ b/gst/flv/gstflvdemux.c @@ -3099,7 +3099,7 @@ gst_flv_demux_class_init (GstFlvDemuxClass * klass) GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_flv_demux_dispose); + gobject_class->dispose = gst_flv_demux_dispose; gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_flv_demux_change_state); diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index 6988091..a7f2d01 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -296,7 +296,7 @@ gst_rtp_jitter_buffer_class_init (GstRtpJitterBufferClass * klass) g_type_class_add_private (klass, sizeof (GstRtpJitterBufferPrivate)); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_rtp_jitter_buffer_finalize); + gobject_class->finalize = gst_rtp_jitter_buffer_finalize; gobject_class->set_property = gst_rtp_jitter_buffer_set_property; gobject_class->get_property = gst_rtp_jitter_buffer_get_property; diff --git a/gst/rtpmanager/gstrtpptdemux.c b/gst/rtpmanager/gstrtpptdemux.c index b3b556a..957ebdb 100644 --- a/gst/rtpmanager/gstrtpptdemux.c +++ b/gst/rtpmanager/gstrtpptdemux.c @@ -212,7 +212,7 @@ gst_rtp_pt_demux_class_init (GstRtpPtDemuxClass * klass) clear_pt_map), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0, G_TYPE_NONE); - gobject_klass->finalize = GST_DEBUG_FUNCPTR (gst_rtp_pt_demux_finalize); + gobject_klass->finalize = gst_rtp_pt_demux_finalize; gstelement_klass->change_state = GST_DEBUG_FUNCPTR (gst_rtp_pt_demux_change_state); diff --git a/gst/rtpmanager/gstrtpssrcdemux.c b/gst/rtpmanager/gstrtpssrcdemux.c index 464c1e1..7d67b6a 100644 --- a/gst/rtpmanager/gstrtpssrcdemux.c +++ b/gst/rtpmanager/gstrtpssrcdemux.c @@ -252,8 +252,8 @@ gst_rtp_ssrc_demux_class_init (GstRtpSsrcDemuxClass * klass) gstelement_klass = (GstElementClass *) klass; gstrtpssrcdemux_klass = (GstRtpSsrcDemuxClass *) klass; - gobject_klass->dispose = GST_DEBUG_FUNCPTR (gst_rtp_ssrc_demux_dispose); - gobject_klass->finalize = GST_DEBUG_FUNCPTR (gst_rtp_ssrc_demux_finalize); + gobject_klass->dispose = gst_rtp_ssrc_demux_dispose; + gobject_klass->finalize = gst_rtp_ssrc_demux_finalize; /** * GstRtpSsrcDemux::new-ssrc-pad: diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c index 8a91450..b343330 100644 --- a/gst/videofilter/gstvideobalance.c +++ b/gst/videofilter/gstvideobalance.c @@ -580,7 +580,7 @@ gst_video_balance_class_init (GstVideoBalanceClass * klass) GST_DEBUG_CATEGORY_INIT (videobalance_debug, "videobalance", 0, "videobalance"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_video_balance_finalize); + gobject_class->finalize = gst_video_balance_finalize; gobject_class->set_property = gst_video_balance_set_property; gobject_class->get_property = gst_video_balance_get_property; diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index 22740e6..eae349c 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -659,7 +659,7 @@ gst_videomixer_class_init (GstVideoMixerClass * klass) GObjectClass *gobject_class = (GObjectClass *) klass; GstElementClass *gstelement_class = (GstElementClass *) klass; - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_videomixer_finalize); + gobject_class->finalize = gst_videomixer_finalize; gobject_class->get_property = gst_videomixer_get_property; gobject_class->set_property = gst_videomixer_set_property; -- 2.7.4