Commit 683a38ad authored by Wim Taymans's avatar Wim Taymans
Browse files

update for new variable names

parent 628bc44c
......@@ -3050,8 +3050,8 @@ gst_ogg_demux_perform_seek_pull (GstOggDemux * ogg, GstEvent * event)
GstFormat format;
gdouble rate;
GstSeekFlags flags;
GstSeekType cur_type, stop_type;
gint64 cur, stop;
GstSeekType start_type, stop_type;
gint64 start, stop;
gboolean update;
guint32 seqnum;
GstEvent *tevent;
......@@ -3060,7 +3060,7 @@ gst_ogg_demux_perform_seek_pull (GstOggDemux * ogg, GstEvent * event)
GST_DEBUG_OBJECT (ogg, "seek with event");
gst_event_parse_seek (event, &rate, &format, &flags,
&cur_type, &cur, &stop_type, &stop);
&start_type, &start, &stop_type, &stop);
/* we can only seek on time */
if (format != GST_FORMAT_TIME) {
......@@ -3121,7 +3121,7 @@ gst_ogg_demux_perform_seek_pull (GstOggDemux * ogg, GstEvent * event)
if (event) {
gst_segment_do_seek (&ogg->segment, rate, format, flags,
cur_type, cur, stop_type, stop, &update);
start_type, start, stop_type, stop, &update);
}
GST_DEBUG_OBJECT (ogg, "segment positions set to %" GST_TIME_FORMAT "-%"
......
......@@ -1811,12 +1811,12 @@ gst_audio_decoder_src_eventfunc (GstAudioDecoder * dec, GstEvent * event)
GstFormat format;
gdouble rate;
GstSeekFlags flags;
GstSeekType cur_type, stop_type;
gint64 cur, stop;
gint64 tcur, tstop;
GstSeekType start_type, stop_type;
gint64 start, stop;
gint64 tstart, tstop;
guint32 seqnum;
gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
gst_event_parse_seek (event, &rate, &format, &flags, &start_type, &start,
&stop_type, &stop);
seqnum = gst_event_get_seqnum (event);
......@@ -1834,8 +1834,8 @@ gst_audio_decoder_src_eventfunc (GstAudioDecoder * dec, GstEvent * event)
/* ... though a non-time seek can be aided as well */
/* First bring the requested format to time */
if (!(res =
gst_pad_query_convert (dec->srcpad, format, cur, GST_FORMAT_TIME,
&tcur)))
gst_pad_query_convert (dec->srcpad, format, start,
GST_FORMAT_TIME, &tstart)))
goto convert_error;
if (!(res =
gst_pad_query_convert (dec->srcpad, format, stop, GST_FORMAT_TIME,
......@@ -1844,7 +1844,7 @@ gst_audio_decoder_src_eventfunc (GstAudioDecoder * dec, GstEvent * event)
/* then seek with time on the peer */
event = gst_event_new_seek (rate, GST_FORMAT_TIME,
flags, cur_type, tcur, stop_type, tstop);
flags, start_type, tstart, stop_type, tstop);
gst_event_set_seqnum (event, seqnum);
res = gst_pad_push_event (dec->sinkpad, event);
......
......@@ -766,30 +766,30 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstObject * parent, GstEvent * event)
{
gdouble rate;
GstFormat format;
GstSeekType cur_type, stop_type;
GstSeekType start_type, stop_type;
GstSeekFlags flags;
gint64 cur, stop;
gint64 start, stop;
gst_event_parse_seek (event, &rate, &format, &flags,
&cur_type, &cur, &stop_type, &stop);
&start_type, &start, &stop_type, &stop);
if (format == GST_FORMAT_BYTES &&
tagdemux->priv->state == GST_TAG_DEMUX_STREAMING &&
gst_pad_is_linked (tagdemux->priv->sinkpad)) {
GstEvent *upstream;
switch (cur_type) {
switch (start_type) {
case GST_SEEK_TYPE_SET:
if (cur == -1)
cur = 0;
cur += tagdemux->priv->strip_start;
if (start == -1)
start = 0;
start += tagdemux->priv->strip_start;
break;
case GST_SEEK_TYPE_END:
/* Adjust the seek to be relative to the start of any end tag
* (note: 10 bytes before end is represented by stop=-10) */
if (cur > 0)
cur = 0;
cur -= tagdemux->priv->strip_end;
if (start > 0)
start = 0;
start -= tagdemux->priv->strip_end;
break;
case GST_SEEK_TYPE_NONE:
default:
......@@ -814,7 +814,7 @@ gst_tag_demux_srcpad_event (GstPad * pad, GstObject * parent, GstEvent * event)
break;
}
upstream = gst_event_new_seek (rate, format, flags,
cur_type, cur, stop_type, stop);
start_type, start, stop_type, stop);
res = gst_pad_push_event (tagdemux->priv->sinkpad, upstream);
}
break;
......
......@@ -1153,12 +1153,12 @@ gst_video_decoder_src_event_default (GstVideoDecoder * decoder,
GstFormat format;
gdouble rate;
GstSeekFlags flags;
GstSeekType cur_type, stop_type;
gint64 cur, stop;
gint64 tcur, tstop;
GstSeekType start_type, stop_type;
gint64 start, stop;
gint64 tstart, tstop;
guint32 seqnum;
gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
gst_event_parse_seek (event, &rate, &format, &flags, &start_type, &start,
&stop_type, &stop);
seqnum = gst_event_get_seqnum (event);
......@@ -1176,8 +1176,8 @@ gst_video_decoder_src_event_default (GstVideoDecoder * decoder,
/* ... though a non-time seek can be aided as well */
/* First bring the requested format to time */
if (!(res =
gst_pad_query_convert (decoder->srcpad, format, cur,
GST_FORMAT_TIME, &tcur)))
gst_pad_query_convert (decoder->srcpad, format, start,
GST_FORMAT_TIME, &tstart)))
goto convert_error;
if (!(res =
gst_pad_query_convert (decoder->srcpad, format, stop,
......@@ -1186,7 +1186,7 @@ gst_video_decoder_src_event_default (GstVideoDecoder * decoder,
/* then seek with time on the peer */
event = gst_event_new_seek (rate, GST_FORMAT_TIME,
flags, cur_type, tcur, stop_type, tstop);
flags, start_type, tstart, stop_type, tstop);
gst_event_set_seqnum (event, seqnum);
res = gst_pad_push_event (decoder->sinkpad, event);
......
......@@ -530,8 +530,8 @@ gst_dp_event_from_packet_0_2 (guint header_length, const guint8 * header,
gdouble rate;
GstFormat format;
GstSeekFlags flags;
GstSeekType cur_type, stop_type;
gint64 cur, stop;
GstSeekType start_type, stop_type;
gint64 start, stop;
g_return_val_if_fail (payload != NULL, NULL);
......@@ -539,12 +539,12 @@ gst_dp_event_from_packet_0_2 (guint header_length, const guint8 * header,
rate = 1.0;
format = (GstFormat) GST_READ_UINT32_BE (payload);
flags = (GstSeekFlags) GST_READ_UINT32_BE (payload + 4);
cur_type = (GstSeekType) GST_READ_UINT32_BE (payload + 8);
cur = (gint64) GST_READ_UINT64_BE (payload + 12);
start_type = (GstSeekType) GST_READ_UINT32_BE (payload + 8);
start = (gint64) GST_READ_UINT64_BE (payload + 12);
stop_type = (GstSeekType) GST_READ_UINT32_BE (payload + 20);
stop = (gint64) GST_READ_UINT64_BE (payload + 24);
event = gst_event_new_seek (rate, format, flags, cur_type, cur,
event = gst_event_new_seek (rate, format, flags, start_type, start,
stop_type, stop);
GST_EVENT_TIMESTAMP (event) = GST_DP_HEADER_TIMESTAMP (header);
break;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment