From eacdaa56b3ad388cd28c7ff04ae78aed82c9edd4 Mon Sep 17 00:00:00 2001 From: Vineeth TM Date: Fri, 4 Mar 2016 16:14:44 +0900 Subject: [PATCH] ugly: use new gst_element_class_add_static_pad_template() https://bugzilla.gnome.org/show_bug.cgi?id=763082 --- ext/a52dec/gsta52dec.c | 6 ++---- ext/amrnb/amrnbdec.c | 6 ++---- ext/amrnb/amrnbenc.c | 6 ++---- ext/amrwbdec/amrwbdec.c | 6 ++---- ext/dvdread/dvdreadsrc.c | 3 +-- ext/lame/gstlamemp3enc.c | 8 ++++---- ext/mad/gstmad.c | 8 ++++---- ext/mpeg2dec/gstmpeg2dec.c | 8 ++++---- ext/sidplay/gstsiddec.cc | 6 ++---- ext/twolame/gsttwolamemp2enc.c | 8 ++++---- ext/x264/gstx264enc.c | 6 ++---- gst/asfdemux/gstasfdemux.c | 12 ++++++------ gst/asfdemux/gstrtpasfdepay.c | 6 ++---- gst/dvdlpcmdec/gstdvdlpcmdec.c | 8 ++++---- gst/dvdsub/gstdvdsubdec.c | 7 +++---- gst/dvdsub/gstdvdsubparse.c | 6 ++---- gst/realmedia/pnmsrc.c | 4 ++-- gst/realmedia/rademux.c | 6 ++---- gst/realmedia/rdtdepay.c | 8 ++++---- gst/realmedia/rdtmanager.c | 16 ++++++++-------- gst/realmedia/rmdemux.c | 12 ++++++------ gst/xingmux/gstxingmux.c | 8 ++++---- 22 files changed, 72 insertions(+), 92 deletions(-) diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c index c78cfeb..b84be76 100644 --- a/ext/a52dec/gsta52dec.c +++ b/ext/a52dec/gsta52dec.c @@ -185,10 +185,8 @@ gst_a52dec_class_init (GstA52DecClass * klass) g_param_spec_boolean ("lfe", "LFE", "LFE", TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&sink_factory)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&src_factory)); + gst_element_class_add_static_pad_template (gstelement_class, &sink_factory); + gst_element_class_add_static_pad_template (gstelement_class, &src_factory); gst_element_class_set_static_metadata (gstelement_class, "ATSC A/52 audio decoder", "Codec/Decoder/Audio", "Decodes ATSC A/52 encoded audio streams", diff --git a/ext/amrnb/amrnbdec.c b/ext/amrnb/amrnbdec.c index 894c0859..1e2225d 100644 --- a/ext/amrnb/amrnbdec.c +++ b/ext/amrnb/amrnbdec.c @@ -114,10 +114,8 @@ gst_amrnbdec_class_init (GstAmrnbDecClass * klass) object_class->set_property = gst_amrnbdec_set_property; object_class->get_property = gst_amrnbdec_get_property; - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&sink_template)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&src_template)); + gst_element_class_add_static_pad_template (element_class, &sink_template); + gst_element_class_add_static_pad_template (element_class, &src_template); gst_element_class_set_static_metadata (element_class, "AMR-NB audio decoder", "Codec/Decoder/Audio", diff --git a/ext/amrnb/amrnbenc.c b/ext/amrnb/amrnbenc.c index 207b5dd..2f72b9f 100644 --- a/ext/amrnb/amrnbenc.c +++ b/ext/amrnb/amrnbenc.c @@ -154,10 +154,8 @@ gst_amrnbenc_class_init (GstAmrnbEncClass * klass) BANDMODE_DEFAULT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&sink_template)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&src_template)); + gst_element_class_add_static_pad_template (element_class, &sink_template); + gst_element_class_add_static_pad_template (element_class, &src_template); gst_element_class_set_static_metadata (element_class, "AMR-NB audio encoder", "Codec/Encoder/Audio", diff --git a/ext/amrwbdec/amrwbdec.c b/ext/amrwbdec/amrwbdec.c index 6cbce45..811384f 100644 --- a/ext/amrwbdec/amrwbdec.c +++ b/ext/amrwbdec/amrwbdec.c @@ -83,10 +83,8 @@ gst_amrwbdec_class_init (GstAmrwbDecClass * klass) GstAudioDecoderClass *base_class = GST_AUDIO_DECODER_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&sink_template)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&src_template)); + gst_element_class_add_static_pad_template (element_class, &sink_template); + gst_element_class_add_static_pad_template (element_class, &src_template); gst_element_class_set_static_metadata (element_class, "AMR-WB audio decoder", "Codec/Decoder/Audio", diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c index 65ba58f..eed2df5 100644 --- a/ext/dvdread/dvdreadsrc.c +++ b/ext/dvdread/dvdreadsrc.c @@ -163,8 +163,7 @@ gst_dvd_read_src_class_init (GstDvdReadSrcClass * klass) g_param_spec_int ("angle", "angle", "angle", 1, 999, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&srctemplate)); + gst_element_class_add_static_pad_template (gstelement_class, &srctemplate); gst_element_class_set_static_metadata (gstelement_class, "DVD Source", "Source/File/DVD", diff --git a/ext/lame/gstlamemp3enc.c b/ext/lame/gstlamemp3enc.c index 43b63ff..a4a637a 100644 --- a/ext/lame/gstlamemp3enc.c +++ b/ext/lame/gstlamemp3enc.c @@ -228,10 +228,10 @@ gst_lamemp3enc_class_init (GstLameMP3EncClass * klass) gobject_class->get_property = gst_lamemp3enc_get_property; gobject_class->finalize = gst_lamemp3enc_finalize; - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_lamemp3enc_src_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_lamemp3enc_sink_template)); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_lamemp3enc_src_template); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_lamemp3enc_sink_template); gst_element_class_set_static_metadata (gstelement_class, "L.A.M.E. mp3 encoder", "Codec/Encoder/Audio", diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c index 93337d2..7588473 100644 --- a/ext/mad/gstmad.c +++ b/ext/mad/gstmad.c @@ -120,10 +120,10 @@ gst_mad_class_init (GstMadClass * klass) g_param_spec_boolean ("ignore-crc", "Ignore CRC", "Ignore CRC errors", TRUE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&mad_sink_template_factory)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&mad_src_template_factory)); + gst_element_class_add_static_pad_template (element_class, + &mad_sink_template_factory); + gst_element_class_add_static_pad_template (element_class, + &mad_src_template_factory); gst_element_class_set_static_metadata (element_class, "mad mp3 decoder", "Codec/Decoder/Audio", diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c index 069394e..eae4841 100644 --- a/ext/mpeg2dec/gstmpeg2dec.c +++ b/ext/mpeg2dec/gstmpeg2dec.c @@ -105,10 +105,10 @@ gst_mpeg2dec_class_init (GstMpeg2decClass * klass) gobject_class->finalize = gst_mpeg2dec_finalize; - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&src_template_factory)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&sink_template_factory)); + gst_element_class_add_static_pad_template (element_class, + &src_template_factory); + gst_element_class_add_static_pad_template (element_class, + &sink_template_factory); gst_element_class_set_static_metadata (element_class, "mpeg1 and mpeg2 video decoder", "Codec/Decoder/Video", "Uses libmpeg2 to decode MPEG video streams", diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc index f06ed9f..93bf8d7 100644 --- a/ext/sidplay/gstsiddec.cc +++ b/ext/sidplay/gstsiddec.cc @@ -198,10 +198,8 @@ gst_siddec_class_init (GstSidDecClass * klass) "Codec/Decoder/Audio", "Use libsidplay to decode SID audio tunes", "Wim Taymans "); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&src_templ)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&sink_templ)); + gst_element_class_add_static_pad_template (gstelement_class, &src_templ); + gst_element_class_add_static_pad_template (gstelement_class, &sink_templ); GST_DEBUG_CATEGORY_INIT (gst_siddec_debug, "siddec", 0, "C64 sid song player"); diff --git a/ext/twolame/gsttwolamemp2enc.c b/ext/twolame/gsttwolamemp2enc.c index a5e1b55..31bec6b 100644 --- a/ext/twolame/gsttwolamemp2enc.c +++ b/ext/twolame/gsttwolamemp2enc.c @@ -327,10 +327,10 @@ gst_two_lame_class_init (GstTwoLameClass * klass) 0, G_MAXINT, gst_two_lame_default_settings.quick_mode_count, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gst_element_class_add_pad_template (GST_ELEMENT_CLASS (klass), - gst_static_pad_template_get (&gst_two_lame_src_template)); - gst_element_class_add_pad_template (GST_ELEMENT_CLASS (klass), - gst_static_pad_template_get (&gst_two_lame_sink_template)); + gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass), + &gst_two_lame_src_template); + gst_element_class_add_static_pad_template (GST_ELEMENT_CLASS (klass), + &gst_two_lame_sink_template); gst_element_class_set_static_metadata (GST_ELEMENT_CLASS (klass), "TwoLAME mp2 encoder", "Codec/Encoder/Audio", diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 2be4ab2..be88578 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -1036,10 +1036,8 @@ gst_x264_enc_class_init (GstX264EncClass * klass) "Josef Zlomek , " "Mark Nauwelaerts "); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&sink_factory)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&src_factory)); + gst_element_class_add_static_pad_template (element_class, &sink_factory); + gst_element_class_add_static_pad_template (element_class, &src_factory); } static void diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 226beba..27bba9c 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -128,12 +128,12 @@ gst_asf_demux_class_init (GstASFDemuxClass * klass) "Codec/Demuxer", "Demultiplexes ASF Streams", "Owen Fraser-Green "); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&audio_src_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&video_src_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_asf_demux_sink_template)); + gst_element_class_add_static_pad_template (gstelement_class, + &audio_src_template); + gst_element_class_add_static_pad_template (gstelement_class, + &video_src_template); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_asf_demux_sink_template); gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_asf_demux_change_state); diff --git a/gst/asfdemux/gstrtpasfdepay.c b/gst/asfdemux/gstrtpasfdepay.c index 1ba5d02..3f13b5c 100644 --- a/gst/asfdemux/gstrtpasfdepay.c +++ b/gst/asfdemux/gstrtpasfdepay.c @@ -75,10 +75,8 @@ gst_rtp_asf_depay_class_init (GstRtpAsfDepayClass * klass) gstelement_class = (GstElementClass *) klass; gstrtpbasedepayload_class = (GstRTPBaseDepayloadClass *) klass; - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&src_factory)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&sink_factory)); + gst_element_class_add_static_pad_template (gstelement_class, &src_factory); + gst_element_class_add_static_pad_template (gstelement_class, &sink_factory); gst_element_class_set_static_metadata (gstelement_class, "RTP ASF packet depayloader", "Codec/Depayloader/Network", diff --git a/gst/dvdlpcmdec/gstdvdlpcmdec.c b/gst/dvdlpcmdec/gstdvdlpcmdec.c index 69c395f..aeb6b59 100644 --- a/gst/dvdlpcmdec/gstdvdlpcmdec.c +++ b/gst/dvdlpcmdec/gstdvdlpcmdec.c @@ -116,10 +116,10 @@ gst_dvdlpcmdec_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&gst_dvdlpcmdec_sink_template)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&gst_dvdlpcmdec_src_template)); + gst_element_class_add_static_pad_template (element_class, + &gst_dvdlpcmdec_sink_template); + gst_element_class_add_static_pad_template (element_class, + &gst_dvdlpcmdec_src_template); gst_element_class_set_static_metadata (element_class, "DVD LPCM Audio decoder", "Codec/Decoder/Audio", "Decode DVD LPCM frames into standard PCM audio", diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c index 89a2c94..77bfbc9 100644 --- a/gst/dvdsub/gstdvdsubdec.c +++ b/gst/dvdsub/gstdvdsubdec.c @@ -109,10 +109,9 @@ gst_dvd_sub_dec_class_init (GstDvdSubDecClass * klass) gobject_class->finalize = gst_dvd_sub_dec_finalize; - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&src_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&subtitle_template)); + gst_element_class_add_static_pad_template (gstelement_class, &src_template); + gst_element_class_add_static_pad_template (gstelement_class, + &subtitle_template); gst_element_class_set_static_metadata (gstelement_class, "DVD subtitle decoder", "Codec/Decoder/Video", diff --git a/gst/dvdsub/gstdvdsubparse.c b/gst/dvdsub/gstdvdsubparse.c index ea49e53..4184a41 100644 --- a/gst/dvdsub/gstdvdsubparse.c +++ b/gst/dvdsub/gstdvdsubparse.c @@ -72,10 +72,8 @@ gst_dvd_sub_parse_class_init (GstDvdSubParseClass * klass) gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_dvd_sub_parse_change_state); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&src_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&sink_template)); + gst_element_class_add_static_pad_template (gstelement_class, &src_template); + gst_element_class_add_static_pad_template (gstelement_class, &sink_template); gst_element_class_set_static_metadata (gstelement_class, "DVD subtitle parser", "Codec/Parser/Subtitle", diff --git a/gst/realmedia/pnmsrc.c b/gst/realmedia/pnmsrc.c index 4db082f..fdd4980 100644 --- a/gst/realmedia/pnmsrc.c +++ b/gst/realmedia/pnmsrc.c @@ -90,8 +90,8 @@ gst_pnm_src_class_init (GstPNMSrcClass * klass) DEFAULT_LOCATION, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_pnm_src_template)); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_pnm_src_template); gst_element_class_set_static_metadata (gstelement_class, "PNM packet receiver", "Source/Network", diff --git a/gst/realmedia/rademux.c b/gst/realmedia/rademux.c index 5aa92ac..3dadcc5 100644 --- a/gst/realmedia/rademux.c +++ b/gst/realmedia/rademux.c @@ -96,10 +96,8 @@ gst_real_audio_demux_class_init (GstRealAudioDemuxClass * klass) gobject_class->finalize = gst_real_audio_demux_finalize; - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&sink_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&src_template)); + gst_element_class_add_static_pad_template (gstelement_class, &sink_template); + gst_element_class_add_static_pad_template (gstelement_class, &src_template); gst_element_class_set_static_metadata (gstelement_class, "RealAudio Demuxer", "Codec/Demuxer", diff --git a/gst/realmedia/rdtdepay.c b/gst/realmedia/rdtdepay.c index ac79b74..5cf5e4a 100644 --- a/gst/realmedia/rdtdepay.c +++ b/gst/realmedia/rdtdepay.c @@ -92,10 +92,10 @@ gst_rdt_depay_class_init (GstRDTDepayClass * klass) gstelement_class->change_state = gst_rdt_depay_change_state; - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_rdt_depay_src_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_rdt_depay_sink_template)); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_rdt_depay_src_template); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_rdt_depay_sink_template); gst_element_class_set_static_metadata (gstelement_class, "RDT packet parser", "Codec/Depayloader/Network", diff --git a/gst/realmedia/rdtmanager.c b/gst/realmedia/rdtmanager.c index 39c74b2..6c763d3 100644 --- a/gst/realmedia/rdtmanager.c +++ b/gst/realmedia/rdtmanager.c @@ -517,15 +517,15 @@ gst_rdt_manager_class_init (GstRDTManagerClass * g_class) GST_DEBUG_FUNCPTR (gst_rdt_manager_release_pad); /* sink pads */ - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_rdt_manager_recv_rtp_sink_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_rdt_manager_recv_rtcp_sink_template)); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_rdt_manager_recv_rtp_sink_template); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_rdt_manager_recv_rtcp_sink_template); /* src pads */ - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_rdt_manager_recv_rtp_src_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_rdt_manager_rtcp_src_template)); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_rdt_manager_recv_rtp_src_template); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_rdt_manager_rtcp_src_template); gst_element_class_set_static_metadata (gstelement_class, "RTP Decoder", "Codec/Parser/Network", diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c index e670f98..4a4eda0 100644 --- a/gst/realmedia/rmdemux.c +++ b/gst/realmedia/rmdemux.c @@ -197,12 +197,12 @@ gst_rmdemux_base_init (GstRMDemuxClass * klass) { GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&gst_rmdemux_sink_template)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&gst_rmdemux_videosrc_template)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&gst_rmdemux_audiosrc_template)); + gst_element_class_add_static_pad_template (element_class, + &gst_rmdemux_sink_template); + gst_element_class_add_static_pad_template (element_class, + &gst_rmdemux_videosrc_template); + gst_element_class_add_static_pad_template (element_class, + &gst_rmdemux_audiosrc_template); gst_element_class_set_static_metadata (element_class, "RealMedia Demuxer", "Codec/Demuxer", "Demultiplex a RealMedia file into audio and video streams", diff --git a/gst/xingmux/gstxingmux.c b/gst/xingmux/gstxingmux.c index 0572060..b0809aa 100644 --- a/gst/xingmux/gstxingmux.c +++ b/gst/xingmux/gstxingmux.c @@ -413,10 +413,10 @@ gst_xing_mux_class_init (GstXingMuxClass * klass) gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_xing_mux_change_state); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_xing_mux_src_template)); - gst_element_class_add_pad_template (gstelement_class, - gst_static_pad_template_get (&gst_xing_mux_sink_template)); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_xing_mux_src_template); + gst_element_class_add_static_pad_template (gstelement_class, + &gst_xing_mux_sink_template); GST_DEBUG_CATEGORY_INIT (xing_mux_debug, "xingmux", 0, "Xing Header Muxer"); -- 2.7.4