diff --git a/ext/gconf/gstswitchsink.c b/ext/gconf/gstswitchsink.c index 815bfada6e..71152c7c11 100644 --- a/ext/gconf/gstswitchsink.c +++ b/ext/gconf/gstswitchsink.c @@ -41,11 +41,6 @@ enum GST_BOILERPLATE (GstSwitchSink, gst_switch_sink, GstBin, GST_TYPE_BIN); -static void gst_switch_sink_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); -static void gst_switch_sink_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); - static void gst_switch_sink_base_init (gpointer klass) { @@ -63,8 +58,6 @@ gst_switch_sink_class_init (GstSwitchSinkClass * klass) GST_STATIC_CAPS_ANY); GstPadTemplate *child_pad_templ; - oklass->set_property = gst_switch_sink_set_property; - oklass->get_property = gst_switch_sink_get_property; oklass->dispose = gst_switch_sink_dispose; eklass->change_state = gst_switch_sink_change_state; @@ -253,47 +246,6 @@ gst_switch_sink_set_child (GstSwitchSink * sink, GstElement * new_kid) return gst_switch_commit_new_kid (sink); } -static void -gst_switch_sink_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GstSwitchSink *sink; - - g_return_if_fail (GST_IS_SWITCH_SINK (object)); - - sink = GST_SWITCH_SINK (object); - - switch (prop_id) { - break; - default: - break; - } -} - -#if 0 -static gboolean -gst_switch_sink_handle_event (GstPad * pad, GstEvent * event) -{ -} -#endif - -static void -gst_switch_sink_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec) -{ - GstSwitchSink *sink; - - g_return_if_fail (GST_IS_SWITCH_SINK (object)); - - sink = GST_SWITCH_SINK (object); - - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - static GstStateChangeReturn gst_switch_sink_change_state (GstElement * element, GstStateChange transition) { diff --git a/gst/qtdemux/gstrtpxqtdepay.c b/gst/qtdemux/gstrtpxqtdepay.c index 4cd9257f40..26e294add6 100644 --- a/gst/qtdemux/gstrtpxqtdepay.c +++ b/gst/qtdemux/gstrtpxqtdepay.c @@ -108,11 +108,6 @@ static gboolean gst_rtp_xqt_depay_setcaps (GstBaseRTPDepayload * depayload, static GstBuffer *gst_rtp_xqt_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf); -static void gst_rtp_xqt_depay_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); -static void gst_rtp_xqt_depay_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); - static GstStateChangeReturn gst_rtp_xqt_depay_change_state (GstElement * element, GstStateChange transition); @@ -144,9 +139,6 @@ gst_rtp_xqt_depay_class_init (GstRtpXQTDepayClass * klass) gobject_class->finalize = gst_rtp_xqt_depay_finalize; - gobject_class->set_property = gst_rtp_xqt_depay_set_property; - gobject_class->get_property = gst_rtp_xqt_depay_get_property; - gstelement_class->change_state = gst_rtp_xqt_depay_change_state; gstbasertpdepayload_class->set_caps = gst_rtp_xqt_depay_setcaps; @@ -676,36 +668,6 @@ unknown_format: } } -static void -gst_rtp_xqt_depay_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GstRtpXQTDepay *rtpxqtdepay; - - rtpxqtdepay = GST_RTP_XQT_DEPAY (object); - - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_rtp_xqt_depay_get_property (GObject * object, guint prop_id, GValue * value, - GParamSpec * pspec) -{ - GstRtpXQTDepay *rtpxqtdepay; - - rtpxqtdepay = GST_RTP_XQT_DEPAY (object); - - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - static GstStateChangeReturn gst_rtp_xqt_depay_change_state (GstElement * element, GstStateChange transition) { diff --git a/gst/rtp/gstrtpL16depay.c b/gst/rtp/gstrtpL16depay.c index 0708d93e9d..914d6e27c0 100644 --- a/gst/rtp/gstrtpL16depay.c +++ b/gst/rtp/gstrtpL16depay.c @@ -82,9 +82,6 @@ static gboolean gst_rtp_L16_depay_setcaps (GstBaseRTPDepayload * depayload, static GstBuffer *gst_rtp_L16_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf); -static GstStateChangeReturn gst_rtp_L16_depay_change_state (GstElement * - element, GstStateChange transition); - static void gst_rtp_L16_depay_base_init (gpointer klass) { @@ -101,16 +98,12 @@ gst_rtp_L16_depay_base_init (gpointer klass) static void gst_rtp_L16_depay_class_init (GstRtpL16DepayClass * klass) { - GstElementClass *gstelement_class; GstBaseRTPDepayloadClass *gstbasertpdepayload_class; - gstelement_class = (GstElementClass *) klass; gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass; parent_class = g_type_class_peek_parent (klass); - gstelement_class->change_state = gst_rtp_L16_depay_change_state; - gstbasertpdepayload_class->set_caps = gst_rtp_L16_depay_setcaps; gstbasertpdepayload_class->process = gst_rtp_L16_depay_process; @@ -269,36 +262,6 @@ empty_packet: } } -static GstStateChangeReturn -gst_rtp_L16_depay_change_state (GstElement * element, GstStateChange transition) -{ - GstRtpL16Depay *rtpL16depay; - GstStateChangeReturn ret; - - rtpL16depay = GST_RTP_L16_DEPAY (element); - - /* - switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - break; - default: - break; - } - */ - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - /* - switch (transition) { - case GST_STATE_CHANGE_READY_TO_NULL: - break; - default: - break; - } - */ - return ret; -} - gboolean gst_rtp_L16_depay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtpac3depay.c b/gst/rtp/gstrtpac3depay.c index b36c636ceb..4dd3bbab3c 100644 --- a/gst/rtp/gstrtpac3depay.c +++ b/gst/rtp/gstrtpac3depay.c @@ -62,9 +62,6 @@ static gboolean gst_rtp_ac3_depay_setcaps (GstBaseRTPDepayload * depayload, static GstBuffer *gst_rtp_ac3_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf); -static GstStateChangeReturn gst_rtp_ac3_depay_change_state (GstElement * - element, GstStateChange transition); - static void gst_rtp_ac3_depay_base_init (gpointer klass) { @@ -81,16 +78,12 @@ gst_rtp_ac3_depay_base_init (gpointer klass) static void gst_rtp_ac3_depay_class_init (GstRtpAC3DepayClass * klass) { - GstElementClass *gstelement_class; GstBaseRTPDepayloadClass *gstbasertpdepayload_class; - gstelement_class = (GstElementClass *) klass; gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass; parent_class = g_type_class_peek_parent (klass); - gstelement_class->change_state = gst_rtp_ac3_depay_change_state; - gstbasertpdepayload_class->set_caps = gst_rtp_ac3_depay_setcaps; gstbasertpdepayload_class->process = gst_rtp_ac3_depay_process; @@ -231,36 +224,6 @@ empty_packet: } } -static GstStateChangeReturn -gst_rtp_ac3_depay_change_state (GstElement * element, GstStateChange transition) -{ - GstRtpAC3Depay *rtpac3depay; - GstStateChangeReturn ret; - - rtpac3depay = GST_RTP_AC3_DEPAY (element); - - /* - switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - break; - default: - break; - } - */ - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - /* - switch (transition) { - case GST_STATE_CHANGE_READY_TO_NULL: - break; - default: - break; - } - */ - return ret; -} - gboolean gst_rtp_ac3_depay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtpdepay.c b/gst/rtp/gstrtpdepay.c index ce98babe42..23e600066d 100644 --- a/gst/rtp/gstrtpdepay.c +++ b/gst/rtp/gstrtpdepay.c @@ -66,9 +66,6 @@ static GstFlowReturn gst_rtp_depay_chain_rtp (GstPad * pad, GstBuffer * buffer); static GstFlowReturn gst_rtp_depay_chain_rtcp (GstPad * pad, GstBuffer * buffer); -static GstStateChangeReturn gst_rtp_depay_change_state (GstElement * element, - GstStateChange transition); - static GstElementClass *parent_class = NULL; /*static guint gst_rtp_depay_signals[LAST_SIGNAL] = { 0 };*/ @@ -114,8 +111,6 @@ gst_rtp_depay_class_init (GstRTPDepayClass * klass) parent_class = g_type_class_peek_parent (klass); - gstelement_class->change_state = gst_rtp_depay_change_state; - GST_DEBUG_CATEGORY_INIT (rtpdepay_debug, "rtpdepay", 0, "RTP decoder"); } @@ -190,37 +185,6 @@ gst_rtp_depay_chain_rtcp (GstPad * pad, GstBuffer * buffer) return GST_FLOW_OK; } -static GstStateChangeReturn -gst_rtp_depay_change_state (GstElement * element, GstStateChange transition) -{ - GstStateChangeReturn ret; - GstRTPDepay *rtpdepay; - - rtpdepay = GST_RTP_DEPAY (element); - - /* - switch (transition) { - case GST_STATE_CHANGE_PAUSED_TO_READY: - break; - default: - break; - } - */ - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - /* - switch (transition) { - case GST_STATE_CHANGE_PAUSED_TO_READY: - break; - default: - break; - } - */ - - return ret; -} - gboolean gst_rtp_depay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtph264pay.c b/gst/rtp/gstrtph264pay.c index 50770b545f..6a9a41f56a 100644 --- a/gst/rtp/gstrtph264pay.c +++ b/gst/rtp/gstrtph264pay.c @@ -104,9 +104,6 @@ enum static void gst_rtp_h264_pay_finalize (GObject * object); -static GstStateChangeReturn gst_rtp_h264_pay_change_state (GstElement * element, - GstStateChange transition); - static void gst_rtp_h264_pay_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void gst_rtp_h264_pay_get_property (GObject * object, guint prop_id, @@ -137,11 +134,9 @@ static void gst_rtp_h264_pay_class_init (GstRtpH264PayClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseRTPPayloadClass *gstbasertppayload_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass; gobject_class->set_property = gst_rtp_h264_pay_set_property; @@ -172,8 +167,6 @@ gst_rtp_h264_pay_class_init (GstRtpH264PayClass * klass) gobject_class->finalize = gst_rtp_h264_pay_finalize; - gstelement_class->change_state = gst_rtp_h264_pay_change_state; - gstbasertppayload_class->set_caps = gst_rtp_h264_pay_setcaps; gstbasertppayload_class->handle_buffer = gst_rtp_h264_pay_handle_buffer; @@ -786,28 +779,6 @@ gst_rtp_h264_pay_handle_buffer (GstBaseRTPPayload * basepayload, return ret; } -static GstStateChangeReturn -gst_rtp_h264_pay_change_state (GstElement * element, GstStateChange transition) -{ - GstRtpH264Pay *rtph264pay; - GstStateChangeReturn ret; - - rtph264pay = GST_RTP_H264_PAY (element); - - switch (transition) { - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - switch (transition) { - default: - break; - } - return ret; -} - static void gst_rtp_h264_pay_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) diff --git a/gst/rtp/gstrtpjpegdepay.c b/gst/rtp/gstrtpjpegdepay.c index 44f2dde07f..75f427294c 100644 --- a/gst/rtp/gstrtpjpegdepay.c +++ b/gst/rtp/gstrtpjpegdepay.c @@ -67,9 +67,6 @@ static gboolean gst_rtp_jpeg_depay_setcaps (GstBaseRTPDepayload * depayload, static GstBuffer *gst_rtp_jpeg_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf); -static GstStateChangeReturn gst_rtp_jpeg_depay_change_state (GstElement * - element, GstStateChange transition); - static void gst_rtp_jpeg_depay_base_init (gpointer klass) { @@ -87,19 +84,15 @@ static void gst_rtp_jpeg_depay_class_init (GstRtpJPEGDepayClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseRTPDepayloadClass *gstbasertpdepayload_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass; gobject_class->finalize = gst_rtp_jpeg_depay_finalize; parent_class = g_type_class_peek_parent (klass); - gstelement_class->change_state = gst_rtp_jpeg_depay_change_state; - gstbasertpdepayload_class->set_caps = gst_rtp_jpeg_depay_setcaps; gstbasertpdepayload_class->process = gst_rtp_jpeg_depay_process; @@ -598,33 +591,6 @@ empty_packet: } } -static GstStateChangeReturn -gst_rtp_jpeg_depay_change_state (GstElement * element, - GstStateChange transition) -{ - GstRtpJPEGDepay *rtpjpegdepay; - GstStateChangeReturn ret; - - rtpjpegdepay = GST_RTP_JPEG_DEPAY (element); - - switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - break; - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - switch (transition) { - case GST_STATE_CHANGE_READY_TO_NULL: - break; - default: - break; - } - return ret; -} - gboolean gst_rtp_jpeg_depay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtpmp1sdepay.c b/gst/rtp/gstrtpmp1sdepay.c index 6e6667369b..6ca6a9bd43 100644 --- a/gst/rtp/gstrtpmp1sdepay.c +++ b/gst/rtp/gstrtpmp1sdepay.c @@ -77,15 +77,6 @@ static gboolean gst_rtp_mp1s_depay_setcaps (GstBaseRTPDepayload * depayload, static GstBuffer *gst_rtp_mp1s_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf); -static void gst_rtp_mp1s_depay_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); -static void gst_rtp_mp1s_depay_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); - -static GstStateChangeReturn gst_rtp_mp1s_depay_change_state (GstElement * - element, GstStateChange transition); - - static void gst_rtp_mp1s_depay_base_init (gpointer klass) { @@ -102,13 +93,8 @@ gst_rtp_mp1s_depay_base_init (gpointer klass) static void gst_rtp_mp1s_depay_class_init (GstRtpMP1SDepayClass * klass) { - GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseRTPDepayloadClass *gstbasertpdepayload_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; - gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -116,10 +102,6 @@ gst_rtp_mp1s_depay_class_init (GstRtpMP1SDepayClass * klass) gstbasertpdepayload_class->process = gst_rtp_mp1s_depay_process; gstbasertpdepayload_class->set_caps = gst_rtp_mp1s_depay_setcaps; - gobject_class->set_property = gst_rtp_mp1s_depay_set_property; - gobject_class->get_property = gst_rtp_mp1s_depay_get_property; - - gstelement_class->change_state = gst_rtp_mp1s_depay_change_state; } static void @@ -168,65 +150,6 @@ gst_rtp_mp1s_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf) return outbuf; } -static void -gst_rtp_mp1s_depay_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GstRtpMP1SDepay *rtpmp1sdepay; - - rtpmp1sdepay = GST_RTP_MP1S_DEPAY (object); - - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_rtp_mp1s_depay_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec) -{ - GstRtpMP1SDepay *rtpmp1sdepay; - - rtpmp1sdepay = GST_RTP_MP1S_DEPAY (object); - - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static GstStateChangeReturn -gst_rtp_mp1s_depay_change_state (GstElement * element, - GstStateChange transition) -{ - GstRtpMP1SDepay *rtpmp1sdepay; - GstStateChangeReturn ret; - - rtpmp1sdepay = GST_RTP_MP1S_DEPAY (element); - - switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - break; - case GST_STATE_CHANGE_READY_TO_PAUSED: - break; - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - switch (transition) { - case GST_STATE_CHANGE_READY_TO_NULL: - break; - default: - break; - } - return ret; -} - gboolean gst_rtp_mp1s_depay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtpmp2tdepay.c b/gst/rtp/gstrtpmp2tdepay.c index de14990f64..b4e4353375 100644 --- a/gst/rtp/gstrtpmp2tdepay.c +++ b/gst/rtp/gstrtpmp2tdepay.c @@ -89,10 +89,6 @@ static void gst_rtp_mp2t_depay_set_property (GObject * object, guint prop_id, static void gst_rtp_mp2t_depay_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static GstStateChangeReturn gst_rtp_mp2t_depay_change_state (GstElement * - element, GstStateChange transition); - - static void gst_rtp_mp2t_depay_base_init (gpointer klass) { @@ -110,11 +106,9 @@ static void gst_rtp_mp2t_depay_class_init (GstRtpMP2TDepayClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseRTPDepayloadClass *gstbasertpdepayload_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass; @@ -132,7 +126,6 @@ gst_rtp_mp2t_depay_class_init (GstRtpMP2TDepayClass * klass) "The amount of bytes that need to be skipped at the beginning of the payload", 0, G_MAXUINT, 0, G_PARAM_READWRITE)); - gstelement_class->change_state = gst_rtp_mp2t_depay_change_state; } static void @@ -235,35 +228,6 @@ gst_rtp_mp2t_depay_get_property (GObject * object, guint prop_id, } } -static GstStateChangeReturn -gst_rtp_mp2t_depay_change_state (GstElement * element, - GstStateChange transition) -{ - GstRtpMP2TDepay *rtpmp2tdepay; - GstStateChangeReturn ret; - - rtpmp2tdepay = GST_RTP_MP2T_DEPAY (element); - - switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - break; - case GST_STATE_CHANGE_READY_TO_PAUSED: - break; - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - switch (transition) { - case GST_STATE_CHANGE_READY_TO_NULL: - break; - default: - break; - } - return ret; -} - gboolean gst_rtp_mp2t_depay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtpmp4apay.c b/gst/rtp/gstrtpmp4apay.c index f4c9d255a2..e395b4ca9a 100644 --- a/gst/rtp/gstrtpmp4apay.c +++ b/gst/rtp/gstrtpmp4apay.c @@ -71,8 +71,6 @@ static void gst_rtp_mp4a_pay_finalize (GObject * object); static gboolean gst_rtp_mp4a_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps); -static GstStateChangeReturn gst_rtp_mp4a_pay_change_state (GstElement * element, - GstStateChange transition); static GstFlowReturn gst_rtp_mp4a_pay_handle_buffer (GstBaseRTPPayload * payload, GstBuffer * buffer); @@ -120,19 +118,15 @@ static void gst_rtp_mp4a_pay_class_init (GstRtpMP4APayClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseRTPPayloadClass *gstbasertppayload_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = gst_rtp_mp4a_pay_finalize; - gstelement_class->change_state = gst_rtp_mp4a_pay_change_state; - gstbasertppayload_class->set_caps = gst_rtp_mp4a_pay_setcaps; gstbasertppayload_class->handle_buffer = gst_rtp_mp4a_pay_handle_buffer; @@ -453,29 +447,6 @@ gst_rtp_mp4a_pay_handle_buffer (GstBaseRTPPayload * basepayload, return ret; } -static GstStateChangeReturn -gst_rtp_mp4a_pay_change_state (GstElement * element, GstStateChange transition) -{ - GstRtpMP4APay *rtpmp4apay; - GstStateChangeReturn ret; - - rtpmp4apay = GST_RTP_MP4A_PAY (element); - - switch (transition) { - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - switch (transition) { - default: - break; - } - return ret; -} - - gboolean gst_rtp_mp4a_pay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtpmp4gpay.c b/gst/rtp/gstrtpmp4gpay.c index 5cc7dac08c..05b5b716fc 100644 --- a/gst/rtp/gstrtpmp4gpay.c +++ b/gst/rtp/gstrtpmp4gpay.c @@ -85,8 +85,6 @@ static void gst_rtp_mp4g_pay_finalize (GObject * object); static gboolean gst_rtp_mp4g_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps); -static GstStateChangeReturn gst_rtp_mp4g_pay_change_state (GstElement * element, - GstStateChange transition); static GstFlowReturn gst_rtp_mp4g_pay_handle_buffer (GstBaseRTPPayload * payload, GstBuffer * buffer); @@ -134,19 +132,15 @@ static void gst_rtp_mp4g_pay_class_init (GstRtpMP4GPayClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseRTPPayloadClass *gstbasertppayload_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = gst_rtp_mp4g_pay_finalize; - gstelement_class->change_state = gst_rtp_mp4g_pay_change_state; - gstbasertppayload_class->set_caps = gst_rtp_mp4g_pay_setcaps; gstbasertppayload_class->handle_buffer = gst_rtp_mp4g_pay_handle_buffer; @@ -550,29 +544,6 @@ gst_rtp_mp4g_pay_handle_buffer (GstBaseRTPPayload * basepayload, return ret; } -static GstStateChangeReturn -gst_rtp_mp4g_pay_change_state (GstElement * element, GstStateChange transition) -{ - GstRtpMP4GPay *rtpmp4gpay; - GstStateChangeReturn ret; - - rtpmp4gpay = GST_RTP_MP4G_PAY (element); - - switch (transition) { - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - switch (transition) { - default: - break; - } - return ret; -} - - gboolean gst_rtp_mp4g_pay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtpmpadepay.c b/gst/rtp/gstrtpmpadepay.c index f63d815751..4fc5734f57 100644 --- a/gst/rtp/gstrtpmpadepay.c +++ b/gst/rtp/gstrtpmpadepay.c @@ -65,9 +65,6 @@ static gboolean gst_rtp_mpa_depay_setcaps (GstBaseRTPDepayload * depayload, static GstBuffer *gst_rtp_mpa_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf); -static GstStateChangeReturn gst_rtp_mpa_depay_change_state (GstElement * - element, GstStateChange transition); - static void gst_rtp_mpa_depay_base_init (gpointer klass) { @@ -84,18 +81,12 @@ gst_rtp_mpa_depay_base_init (gpointer klass) static void gst_rtp_mpa_depay_class_init (GstRtpMPADepayClass * klass) { - GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseRTPDepayloadClass *gstbasertpdepayload_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass; parent_class = g_type_class_peek_parent (klass); - gstelement_class->change_state = gst_rtp_mpa_depay_change_state; - gstbasertpdepayload_class->set_caps = gst_rtp_mpa_depay_setcaps; gstbasertpdepayload_class->process = gst_rtp_mpa_depay_process; @@ -193,32 +184,6 @@ empty_packet: } } -static GstStateChangeReturn -gst_rtp_mpa_depay_change_state (GstElement * element, GstStateChange transition) -{ - GstRtpMPADepay *rtpmpadepay; - GstStateChangeReturn ret; - - rtpmpadepay = GST_RTP_MPA_DEPAY (element); - - switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - break; - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - switch (transition) { - case GST_STATE_CHANGE_READY_TO_NULL: - break; - default: - break; - } - return ret; -} - gboolean gst_rtp_mpa_depay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtpmpvdepay.c b/gst/rtp/gstrtpmpvdepay.c index beb5237e54..c03f40556b 100644 --- a/gst/rtp/gstrtpmpvdepay.c +++ b/gst/rtp/gstrtpmpvdepay.c @@ -68,9 +68,6 @@ static gboolean gst_rtp_mpv_depay_setcaps (GstBaseRTPDepayload * depayload, static GstBuffer *gst_rtp_mpv_depay_process (GstBaseRTPDepayload * depayload, GstBuffer * buf); -static GstStateChangeReturn gst_rtp_mpv_depay_change_state (GstElement * - element, GstStateChange transition); - static void gst_rtp_mpv_depay_base_init (gpointer klass) { @@ -87,18 +84,12 @@ gst_rtp_mpv_depay_base_init (gpointer klass) static void gst_rtp_mpv_depay_class_init (GstRtpMPVDepayClass * klass) { - GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseRTPDepayloadClass *gstbasertpdepayload_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass; parent_class = g_type_class_peek_parent (klass); - gstelement_class->change_state = gst_rtp_mpv_depay_change_state; - gstbasertpdepayload_class->set_caps = gst_rtp_mpv_depay_setcaps; gstbasertpdepayload_class->process = gst_rtp_mpv_depay_process; @@ -212,32 +203,6 @@ empty_packet: } } -static GstStateChangeReturn -gst_rtp_mpv_depay_change_state (GstElement * element, GstStateChange transition) -{ - GstRtpMPVDepay *rtpmpvdepay; - GstStateChangeReturn ret; - - rtpmpvdepay = GST_RTP_MPV_DEPAY (element); - - switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - break; - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - switch (transition) { - case GST_STATE_CHANGE_READY_TO_NULL: - break; - default: - break; - } - return ret; -} - gboolean gst_rtp_mpv_depay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtptheoradepay.c b/gst/rtp/gstrtptheoradepay.c index 53a4abfbfd..49e6284e1a 100644 --- a/gst/rtp/gstrtptheoradepay.c +++ b/gst/rtp/gstrtptheoradepay.c @@ -79,9 +79,6 @@ static GstBuffer *gst_rtp_theora_depay_process (GstBaseRTPDepayload * depayload, static void gst_rtp_theora_depay_finalize (GObject * object); -static GstStateChangeReturn gst_rtp_theora_depay_change_state (GstElement * - element, GstStateChange transition); - static void gst_rtp_theora_depay_base_init (gpointer klass) @@ -100,17 +97,13 @@ static void gst_rtp_theora_depay_class_init (GstRtpTheoraDepayClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseRTPDepayloadClass *gstbasertpdepayload_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasertpdepayload_class = (GstBaseRTPDepayloadClass *) klass; gobject_class->finalize = gst_rtp_theora_depay_finalize; - gstelement_class->change_state = gst_rtp_theora_depay_change_state; - gstbasertpdepayload_class->process = gst_rtp_theora_depay_process; gstbasertpdepayload_class->set_caps = gst_rtp_theora_depay_setcaps; @@ -591,35 +584,6 @@ length_short: } } -static GstStateChangeReturn -gst_rtp_theora_depay_change_state (GstElement * element, - GstStateChange transition) -{ - GstRtpTheoraDepay *rtptheoradepay; - GstStateChangeReturn ret; - - rtptheoradepay = GST_RTP_THEORA_DEPAY (element); - - switch (transition) { - case GST_STATE_CHANGE_NULL_TO_READY: - break; - case GST_STATE_CHANGE_READY_TO_PAUSED: - break; - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - - switch (transition) { - case GST_STATE_CHANGE_READY_TO_NULL: - break; - default: - break; - } - return ret; -} - gboolean gst_rtp_theora_depay_plugin_init (GstPlugin * plugin) { diff --git a/gst/rtp/gstrtpvrawpay.c b/gst/rtp/gstrtpvrawpay.c index 0f0ef7e826..6faaf26a40 100644 --- a/gst/rtp/gstrtpvrawpay.c +++ b/gst/rtp/gstrtpvrawpay.c @@ -114,7 +114,6 @@ GST_STATIC_PAD_TEMPLATE ("src", static void gst_rtp_vraw_pay_class_init (GstRtpVRawPayClass * klass); static void gst_rtp_vraw_pay_base_init (GstRtpVRawPayClass * klass); static void gst_rtp_vraw_pay_init (GstRtpVRawPay * rtpvrawpay); -static void gst_rtp_vraw_pay_finalize (GObject * object); static gboolean gst_rtp_vraw_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps); @@ -164,18 +163,12 @@ gst_rtp_vraw_pay_base_init (GstRtpVRawPayClass * klass) static void gst_rtp_vraw_pay_class_init (GstRtpVRawPayClass * klass) { - GObjectClass *gobject_class; - GstElementClass *gstelement_class; GstBaseRTPPayloadClass *gstbasertppayload_class; - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; gstbasertppayload_class = (GstBaseRTPPayloadClass *) klass; parent_class = g_type_class_peek_parent (klass); - gobject_class->finalize = gst_rtp_vraw_pay_finalize; - gstbasertppayload_class->set_caps = gst_rtp_vraw_pay_setcaps; gstbasertppayload_class->handle_buffer = gst_rtp_vraw_pay_handle_buffer; @@ -188,16 +181,6 @@ gst_rtp_vraw_pay_init (GstRtpVRawPay * rtpvrawpay) { } -static void -gst_rtp_vraw_pay_finalize (GObject * object) -{ - GstRtpVRawPay *rtpvrawpay; - - rtpvrawpay = GST_RTP_VRAW_PAY (object); - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - static gboolean gst_rtp_vraw_pay_setcaps (GstBaseRTPPayload * payload, GstCaps * caps) {