From 0d0444e0fa2c78ea12d3034bb8fa69c2c402895f Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 9 Nov 2011 11:55:14 +0100 Subject: [PATCH] remove query types --- gst-libs/gst/video/gstbasevideodecoder.c | 17 ----------------- gst-libs/gst/video/gstbasevideoencoder.c | 16 ---------------- gst/mpegtsdemux/tsdemux.c | 14 -------------- 3 files changed, 47 deletions(-) diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c index af9ef6e2bf..863c69244a 100644 --- a/gst-libs/gst/video/gstbasevideodecoder.c +++ b/gst-libs/gst/video/gstbasevideodecoder.c @@ -149,8 +149,6 @@ static gboolean gst_base_video_decoder_sink_query (GstPad * pad, GstQuery * query); static GstStateChangeReturn gst_base_video_decoder_change_state (GstElement * element, GstStateChange transition); -static const GstQueryType *gst_base_video_decoder_get_query_types (GstPad * - pad); static gboolean gst_base_video_decoder_src_query (GstPad * pad, GstQuery * query); static void gst_base_video_decoder_reset (GstBaseVideoDecoder * @@ -214,8 +212,6 @@ gst_base_video_decoder_init (GstBaseVideoDecoder * base_video_decoder) gst_pad_set_event_function (pad, GST_DEBUG_FUNCPTR (gst_base_video_decoder_src_event)); - gst_pad_set_query_type_function (pad, - GST_DEBUG_FUNCPTR (gst_base_video_decoder_get_query_types)); gst_pad_set_query_function (pad, GST_DEBUG_FUNCPTR (gst_base_video_decoder_src_query)); gst_pad_use_fixed_caps (pad); @@ -698,19 +694,6 @@ convert_error: goto done; } -static const GstQueryType * -gst_base_video_decoder_get_query_types (GstPad * pad) -{ - static const GstQueryType query_types[] = { - GST_QUERY_POSITION, - GST_QUERY_DURATION, - GST_QUERY_CONVERT, - 0 - }; - - return query_types; -} - static gboolean gst_base_video_decoder_src_query (GstPad * pad, GstQuery * query) { diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c index c1804e9af9..af7943fbfe 100644 --- a/gst-libs/gst/video/gstbasevideoencoder.c +++ b/gst-libs/gst/video/gstbasevideoencoder.c @@ -125,8 +125,6 @@ static GstFlowReturn gst_base_video_encoder_chain (GstPad * pad, GstBuffer * buf); static GstStateChangeReturn gst_base_video_encoder_change_state (GstElement * element, GstStateChange transition); -static const GstQueryType *gst_base_video_encoder_get_query_types (GstPad * - pad); static gboolean gst_base_video_encoder_src_query (GstPad * pad, GstQuery * query); @@ -197,8 +195,6 @@ gst_base_video_encoder_init (GstBaseVideoEncoder * base_video_encoder) pad = GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder); - gst_pad_set_query_type_function (pad, - GST_DEBUG_FUNCPTR (gst_base_video_encoder_get_query_types)); gst_pad_set_query_function (pad, GST_DEBUG_FUNCPTR (gst_base_video_encoder_src_query)); gst_pad_set_event_function (pad, @@ -615,18 +611,6 @@ gst_base_video_encoder_src_event (GstPad * pad, GstEvent * event) return ret; } -static const GstQueryType * -gst_base_video_encoder_get_query_types (GstPad * pad) -{ - static const GstQueryType query_types[] = { - GST_QUERY_CONVERT, - GST_QUERY_LATENCY, - 0 - }; - - return query_types; -} - static gboolean gst_base_video_encoder_src_query (GstPad * pad, GstQuery * query) { diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c index c0494115d2..2f667bd3aa 100644 --- a/gst/mpegtsdemux/tsdemux.c +++ b/gst/mpegtsdemux/tsdemux.c @@ -179,7 +179,6 @@ enum }; /* Pad functions */ -static const GstQueryType *gst_ts_demux_srcpad_query_types (GstPad * pad); static gboolean gst_ts_demux_srcpad_query (GstPad * pad, GstQuery * query); @@ -368,18 +367,6 @@ gst_ts_demux_get_property (GObject * object, guint prop_id, } } -static const GstQueryType * -gst_ts_demux_srcpad_query_types (GstPad * pad) -{ - static const GstQueryType query_types[] = { - GST_QUERY_DURATION, - GST_QUERY_SEEKING, - 0 - }; - - return query_types; -} - static gboolean gst_ts_demux_srcpad_query (GstPad * pad, GstQuery * query) { @@ -1197,7 +1184,6 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream, pad = gst_pad_new_from_template (template, name); gst_pad_use_fixed_caps (pad); gst_pad_set_caps (pad, caps); - gst_pad_set_query_type_function (pad, gst_ts_demux_srcpad_query_types); gst_pad_set_query_function (pad, gst_ts_demux_srcpad_query); gst_pad_set_event_function (pad, gst_ts_demux_srcpad_event); }