From a885082a160ac428532d0d5b035c22be08618ece Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sat, 18 Jun 2011 17:35:41 +0200 Subject: [PATCH] gstpad: Remove unused variable do_event_actions do_event_actions was always used as TRUE --- gst/gstpad.c | 75 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/gst/gstpad.c b/gst/gstpad.c index c851e78..44f6b38 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -4212,7 +4212,7 @@ gst_pad_push_event (GstPad * pad, GstEvent * event) { GstFlowReturn ret; GstPad *peerpad; - gboolean result, do_event_actions = TRUE; + gboolean result; gboolean stored = FALSE; g_return_val_if_fail (GST_IS_PAD (pad), FALSE); @@ -4264,49 +4264,46 @@ gst_pad_push_event (GstPad * pad, GstEvent * event) } /* backwards compatibility mode for caps */ - if (do_event_actions) { - do_event_actions = FALSE; - - switch (GST_EVENT_TYPE (event)) { - case GST_EVENT_CAPS: - { - GST_OBJECT_UNLOCK (pad); - - g_object_notify_by_pspec ((GObject *) pad, pspec_caps); + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_CAPS: + { + GST_OBJECT_UNLOCK (pad); - GST_OBJECT_LOCK (pad); - /* the peerpad might have changed. Things we checked above could not - * have changed. */ - peerpad = GST_PAD_PEER (pad); - break; - } - case GST_EVENT_SEGMENT: - { - gint64 offset; - - offset = pad->offset; - /* check if we need to adjust the segment */ - if (offset != 0 && (peerpad != NULL)) { - GstSegment segment; - - /* copy segment values */ - gst_event_copy_segment (event, &segment); - gst_event_unref (event); + g_object_notify_by_pspec ((GObject *) pad, pspec_caps); - /* adjust and make a new event with the offset applied */ - segment.base += offset; - event = gst_event_new_segment (&segment); - } - break; + GST_OBJECT_LOCK (pad); + /* the peerpad might have changed. Things we checked above could not + * have changed. */ + peerpad = GST_PAD_PEER (pad); + break; + } + case GST_EVENT_SEGMENT: + { + gint64 offset; + + offset = pad->offset; + /* check if we need to adjust the segment */ + if (offset != 0 && (peerpad != NULL)) { + GstSegment segment; + + /* copy segment values */ + gst_event_copy_segment (event, &segment); + gst_event_unref (event); + + /* adjust and make a new event with the offset applied */ + segment.base += offset; + event = gst_event_new_segment (&segment); } - case GST_EVENT_RECONFIGURE: - if (GST_PAD_IS_SINK (pad)) - GST_OBJECT_FLAG_SET (pad, GST_PAD_NEED_RECONFIGURE); - break; - default: - break; + break; } + case GST_EVENT_RECONFIGURE: + if (GST_PAD_IS_SINK (pad)) + GST_OBJECT_FLAG_SET (pad, GST_PAD_NEED_RECONFIGURE); + break; + default: + break; } + if (G_UNLIKELY (GST_PAD_IS_FLUSHING (pad))) goto flushed; -- 2.7.4