diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2015-06-11 11:05:38 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2015-06-11 11:05:38 +0200 |
commit | c324e31c26e7eb088ac79001e4eb5ed76fe8f094 (patch) | |
tree | 9146b0ad5edece7cb29b5f9d7d68da1257872822 /plugins/elements/gstconcat.c | |
parent | 25c66e60045e44d50a591f5d62706f6f243bb9ca (diff) |
concat: Add some newlines to event handling code to make the code look a bit less dense
Diffstat (limited to 'plugins/elements/gstconcat.c')
-rw-r--r-- | plugins/elements/gstconcat.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/elements/gstconcat.c b/plugins/elements/gstconcat.c index 75890f2048..c302dbb826 100644 --- a/plugins/elements/gstconcat.c +++ b/plugins/elements/gstconcat.c @@ -484,6 +484,7 @@ gst_concat_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) } case GST_EVENT_EOS:{ gst_event_unref (event); + if (!gst_concat_pad_wait (spad, self)) { ret = FALSE; } else { @@ -505,11 +506,13 @@ gst_concat_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) } case GST_EVENT_FLUSH_START:{ gboolean forward; + g_mutex_lock (&self->lock); spad->flushing = TRUE; g_cond_broadcast (&self->cond); forward = (self->current_sinkpad == GST_PAD_CAST (spad)); g_mutex_unlock (&self->lock); + if (forward) ret = gst_pad_event_default (pad, parent, event); else @@ -518,13 +521,17 @@ gst_concat_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) } case GST_EVENT_FLUSH_STOP:{ gboolean forward; + gst_segment_init (&spad->segment, GST_FORMAT_UNDEFINED); spad->flushing = FALSE; + g_mutex_lock (&self->lock); forward = (self->current_sinkpad == GST_PAD_CAST (spad)); g_mutex_unlock (&self->lock); + if (forward) { gboolean reset_time; + gst_event_parse_flush_stop (event, &reset_time); if (reset_time) { GST_DEBUG_OBJECT (self, @@ -532,8 +539,9 @@ gst_concat_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) self->current_start_offset = 0; } ret = gst_pad_event_default (pad, parent, event); - } else + } else { gst_event_unref (event); + } break; } default:{ |