mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

avidemux: rename some variable

Browse source 
Rename the seek_event variable to seg_event because it really contains the
newsegment event that needs to be pushed.
This commit is contained in:
Wim Taymans 2010-01-20 11:22:04 +01:00
parent 2950423265
commit 183d450113
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gst/avi/gstavidemux.c
View file

@ -279,9 +279,9 @@ gst_avi_demux_reset (GstAviDemux * avi)
gst_object_unref (avi->element_index);
avi->element_index = NULL;
if (avi->seek_event) {
gst_event_unref (avi->seek_event);
avi->seek_event = NULL;
if (avi->seg_event) {
gst_event_unref (avi->seg_event);
avi->seg_event = NULL;
}
if (avi->globaltags)
@ -3043,9 +3043,9 @@ skipping_done:
GST_DEBUG_OBJECT (avi, "segment stop %" G_GINT64_FORMAT, stop);
if (avi->seek_event)
gst_event_unref (avi->seek_event);
avi->seek_event = gst_event_new_new_segment_full
if (avi->seg_event)
gst_event_unref (avi->seg_event);
avi->seg_event = gst_event_new_new_segment_full
(FALSE, avi->segment.rate, avi->segment.applied_rate, GST_FORMAT_TIME,
avi->segment.start, stop, avi->segment.time);
@ -3517,9 +3517,9 @@ skipping_done:
gst_avi_demux_do_seek (avi, &avi->segment);
/* prepare initial segment */
if (avi->seek_event)
gst_event_unref (avi->seek_event);
avi->seek_event = gst_event_new_new_segment_full
if (avi->seg_event)
gst_event_unref (avi->seg_event);
avi->seg_event = gst_event_new_new_segment_full
(FALSE, avi->segment.rate, avi->segment.applied_rate, GST_FORMAT_TIME,
avi->segment.start, stop, avi->segment.time);
@ -3834,16 +3834,16 @@ gst_avi_demux_handle_seek (GstAviDemux * avi, GstPad * pad, GstEvent * event)
stop = avi->segment.duration;
/* queue the segment event for the streaming thread. */
if (avi->seek_event)
gst_event_unref (avi->seek_event);
if (avi->seg_event)
gst_event_unref (avi->seg_event);
if (avi->segment.rate > 0.0) {
/* forwards goes from last_stop to stop */
avi->seek_event = gst_event_new_new_segment_full (FALSE,
avi->seg_event = gst_event_new_new_segment_full (FALSE,
avi->segment.rate, avi->segment.applied_rate, avi->segment.format,
avi->segment.last_stop, stop, avi->segment.time);
} else {
/* reverse goes from start to last_stop */
avi->seek_event = gst_event_new_new_segment_full (FALSE,
avi->seg_event = gst_event_new_new_segment_full (FALSE,
avi->segment.rate, avi->segment.applied_rate, avi->segment.format,
avi->segment.start, avi->segment.last_stop, avi->segment.time);
}
@ -4638,9 +4638,9 @@ gst_avi_demux_loop (GstPad * pad)
avi->state = GST_AVI_DEMUX_MOVI;
break;
case GST_AVI_DEMUX_MOVI:
if (G_UNLIKELY (avi->seek_event)) {
gst_avi_demux_push_event (avi, avi->seek_event);
avi->seek_event = NULL;
if (G_UNLIKELY (avi->seg_event)) {
gst_avi_demux_push_event (avi, avi->seg_event);
avi->seg_event = NULL;
}
if (G_UNLIKELY (avi->got_tags)) {
push_tag_lists (avi);
@ -4728,9 +4728,9 @@ gst_avi_demux_chain (GstPad * pad, GstBuffer * buf)
}
break;
case GST_AVI_DEMUX_MOVI:
if (G_UNLIKELY (avi->seek_event)) {
gst_avi_demux_push_event (avi, avi->seek_event);
avi->seek_event = NULL;
if (G_UNLIKELY (avi->seg_event)) {
gst_avi_demux_push_event (avi, avi->seg_event);
avi->seg_event = NULL;
}
if (G_UNLIKELY (avi->got_tags)) {
push_tag_lists (avi);

2
gst/avi/gstavidemux.h
View file

@ -181,7 +181,7 @@ typedef struct _GstAviDemux {
gboolean segment_running;
/* pending tags/events */
GstEvent *seek_event;
GstEvent *seg_event;
GstTagList *globaltags;
gboolean got_tags;