Commit c07b57fc authored by Wim Taymans's avatar Wim Taymans

segment: remove _full version

Rename the _full versions of the functions to the normal function names.
parent d63829fc
......@@ -528,55 +528,6 @@ gst_event_parse_caps (GstEvent * event, GstCaps ** caps)
/**
* gst_event_new_new_segment:
* @update: is this segment an update to a previous one
* @rate: a new rate for playback
* @format: The format of the segment values
* @start: the start value of the segment
* @stop: the stop value of the segment
* @time: the time value of the segment
*
* Allocate a new newsegment event with the given format/values tripplets
*
* This method calls gst_event_new_new_segment_full() passing a default
* value of 1.0 for applied_rate
*
* Returns: (transfer full): a new newsegment event.
*/
GstEvent *
gst_event_new_new_segment (gboolean update, gdouble rate, GstFormat format,
gint64 start, gint64 stop, gint64 time)
{
return gst_event_new_new_segment_full (update, rate, 1.0, format, start,
stop, time);
}
/**
* gst_event_parse_new_segment:
* @event: The event to query
* @update: (out): A pointer to the update flag of the segment
* @rate: (out): A pointer to the rate of the segment
* @format: (out): A pointer to the format of the newsegment values
* @start: (out): A pointer to store the start value in
* @stop: (out): A pointer to store the stop value in
* @time: (out): A pointer to store the time value in
*
* Get the update flag, rate, format, start, stop and time in the
* newsegment event. In general, gst_event_parse_new_segment_full() should
* be used instead of this, to also retrieve the applied_rate value of the
* segment. See gst_event_new_new_segment_full() for a full description
* of the newsegment event.
*/
void
gst_event_parse_new_segment (GstEvent * event, gboolean * update,
gdouble * rate, GstFormat * format, gint64 * start,
gint64 * stop, gint64 * time)
{
gst_event_parse_new_segment_full (event, update, rate, NULL, format, start,
stop, time);
}
/**
* gst_event_new_new_segment_full:
* @update: Whether this segment is an update to a previous one
* @rate: A new rate for playback
* @applied_rate: The rate factor which has already been applied
......@@ -620,7 +571,7 @@ gst_event_parse_new_segment (GstEvent * event, gboolean * update,
* Since: 0.10.6
*/
GstEvent *
gst_event_new_new_segment_full (gboolean update, gdouble rate,
gst_event_new_new_segment (gboolean update, gdouble rate,
gdouble applied_rate, GstFormat format, gint64 start, gint64 stop,
gint64 time)
{
......@@ -664,7 +615,7 @@ gst_event_new_new_segment_full (gboolean update, gdouble rate,
}
/**
* gst_event_parse_new_segment_full:
* gst_event_parse_new_segment:
* @event: The event to query
* @update: (out): A pointer to the update flag of the segment
* @rate: (out): A pointer to the rate of the segment
......@@ -675,13 +626,13 @@ gst_event_new_new_segment_full (gboolean update, gdouble rate,
* @time: (out): A pointer to store the time value in
*
* Get the update, rate, applied_rate, format, start, stop and
* time in the newsegment event. See gst_event_new_new_segment_full()
* time in the newsegment event. See gst_event_new_new_segment()
* for a full description of the newsegment event.
*
* Since: 0.10.6
*/
void
gst_event_parse_new_segment_full (GstEvent * event, gboolean * update,
gst_event_parse_new_segment (GstEvent * event, gboolean * update,
gdouble * rate, gdouble * applied_rate, GstFormat * format,
gint64 * start, gint64 * stop, gint64 * time)
{
......
......@@ -463,21 +463,11 @@ void gst_event_parse_caps (GstEvent *event, GstCaps **caps
/* newsegment events */
GstEvent* gst_event_new_new_segment (gboolean update, gdouble rate,
GstFormat format,
gint64 start, gint64 stop,
gint64 time);
GstEvent* gst_event_new_new_segment_full (gboolean update, gdouble rate,
gdouble applied_rate,
GstFormat format,
gint64 start, gint64 stop,
gint64 time);
void gst_event_parse_new_segment (GstEvent *event,
gboolean *update,
gdouble *rate,
GstFormat *format,
gint64 *start, gint64 *stop,
gint64 *time);
void gst_event_parse_new_segment_full (GstEvent *event,
gboolean *update,
gdouble *rate,
gdouble *applied_rate,
......
......@@ -404,29 +404,6 @@ gst_segment_set_seek (GstSegment * segment, gdouble rate,
* @segment: a #GstSegment structure.
* @update: flag indicating a new segment is started or updated
* @rate: the rate of the segment.
* @format: the format of the segment.
* @start: the new start value
* @stop: the new stop value
* @time: the new stream time
*
* Update the segment structure with the field values of a new segment event and
* with a default applied_rate of 1.0.
*
* Since: 0.10.6
*/
void
gst_segment_set_newsegment (GstSegment * segment, gboolean update, gdouble rate,
GstFormat format, gint64 start, gint64 stop, gint64 time)
{
gst_segment_set_newsegment_full (segment, update, rate, 1.0, format, start,
stop, time);
}
/**
* gst_segment_set_newsegment_full:
* @segment: a #GstSegment structure.
* @update: flag indicating a new segment is started or updated
* @rate: the rate of the segment.
* @applied_rate: the applied rate of the segment.
* @format: the format of the segment.
* @start: the new start value
......@@ -436,7 +413,7 @@ gst_segment_set_newsegment (GstSegment * segment, gboolean update, gdouble rate,
* Update the segment structure with the field values of a new segment event.
*/
void
gst_segment_set_newsegment_full (GstSegment * segment, gboolean update,
gst_segment_set_newsegment (GstSegment * segment, gboolean update,
gdouble rate, gdouble applied_rate, GstFormat format, gint64 start,
gint64 stop, gint64 time)
{
......
......@@ -35,6 +35,7 @@ typedef struct _GstSegment GstSegment;
/**
* GstSegment:
* @rate: the rate of the segment
* @applied_rate: the already applied rate to the segment
* @format: the format of the segment values
* @flags: flags for this segment
* @start: the start of the segment
......@@ -43,7 +44,6 @@ typedef struct _GstSegment GstSegment;
* @accum: accumulated segment
* @last_stop: last known stop time
* @duration: total duration of segment
* @applied_rate: the already applied rate to the segment
*
* A helper structure that holds the configured region of
* interest in a media file.
......@@ -84,8 +84,6 @@ void gst_segment_set_seek (GstSegment *segment, gdouble rate,
gboolean *update);
void gst_segment_set_newsegment (GstSegment *segment, gboolean update, gdouble rate,
GstFormat format, gint64 start, gint64 stop, gint64 time);
void gst_segment_set_newsegment_full (GstSegment *segment, gboolean update, gdouble rate,
gdouble applied_rate, GstFormat format, gint64 start,
gint64 stop, gint64 time);
......
......@@ -904,7 +904,7 @@ gst_base_parse_sink_eventfunc (GstBaseParse * parse, GstEvent * event)
gint64 start, stop, pos, next_ts, offset = 0;
gboolean update;
gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate,
gst_event_parse_new_segment (event, &update, &rate, &applied_rate,
&format, &start, &stop, &pos);
GST_DEBUG_OBJECT (parse, "newseg rate %g, applied rate %g, "
......@@ -955,7 +955,7 @@ gst_base_parse_sink_eventfunc (GstBaseParse * parse, GstEvent * event)
}
gst_event_unref (event);
event = gst_event_new_new_segment_full (update, rate, applied_rate,
event = gst_event_new_new_segment (update, rate, applied_rate,
GST_FORMAT_TIME, seg_start, seg_stop, seg_start);
format = GST_FORMAT_TIME;
start = seg_start;
......@@ -967,7 +967,7 @@ gst_base_parse_sink_eventfunc (GstBaseParse * parse, GstEvent * event)
/* Unknown incoming segment format. Output a default open-ended
* TIME segment */
gst_event_unref (event);
event = gst_event_new_new_segment_full (update, rate, applied_rate,
event = gst_event_new_new_segment (update, rate, applied_rate,
GST_FORMAT_TIME, 0, GST_CLOCK_TIME_NONE, 0);
format = GST_FORMAT_TIME;
next_ts = start = 0;
......@@ -979,7 +979,7 @@ gst_base_parse_sink_eventfunc (GstBaseParse * parse, GstEvent * event)
next_ts = start;
}
gst_segment_set_newsegment_full (&parse->segment, update, rate,
gst_segment_set_newsegment (&parse->segment, update, rate,
applied_rate, format, start, stop, start);
/* save the segment for later, right before we push a new buffer so that
......@@ -1772,6 +1772,7 @@ gst_base_parse_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
GST_TIME_ARGS (parse->segment.start));
parse->priv->pending_segment =
gst_event_new_new_segment (FALSE, parse->segment.rate,
parse->segment.applied_rate,
parse->segment.format, parse->segment.start,
parse->segment.stop, parse->segment.start);
}
......@@ -1799,6 +1800,7 @@ gst_base_parse_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
parse->segment.start = last_start;
parse->priv->pending_segment =
gst_event_new_new_segment (FALSE, parse->segment.rate,
parse->segment.applied_rate,
parse->segment.format, parse->segment.start,
parse->segment.stop, parse->segment.start);
} else {
......@@ -1807,19 +1809,21 @@ gst_base_parse_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
/* close ahead of gap */
gst_pad_push_event (parse->srcpad,
gst_event_new_new_segment (TRUE, parse->segment.rate,
parse->segment.applied_rate,
parse->segment.format, parse->segment.last_stop,
parse->segment.last_stop, parse->segment.last_stop));
/* skip gap */
gst_pad_push_event (parse->srcpad,
gst_event_new_new_segment (FALSE, parse->segment.rate,
parse->segment.applied_rate,
parse->segment.format, last_start,
parse->segment.stop, last_start));
}
/* align segment view with downstream,
* prevents double-counting accum when closing segment */
gst_segment_set_newsegment (&parse->segment, FALSE,
parse->segment.rate, parse->segment.format, last_start,
parse->segment.stop, last_start);
parse->segment.rate, parse->segment.applied_rate,
parse->segment.format, last_start, parse->segment.stop, last_start);
parse->segment.last_stop = last_start;
}
}
......@@ -2794,8 +2798,9 @@ gst_base_parse_sink_activate_pull (GstPad * sinkpad, gboolean active)
if (result) {
if (active) {
parse->priv->pending_segment = gst_event_new_new_segment (FALSE,
parse->segment.rate, parse->segment.format,
parse->segment.start, parse->segment.stop, parse->segment.last_stop);
parse->segment.rate, parse->segment.applied_rate,
parse->segment.format, parse->segment.start, parse->segment.stop,
parse->segment.last_stop);
result &=
gst_pad_start_task (sinkpad, (GstTaskFunction) gst_base_parse_loop,
sinkpad);
......@@ -3569,8 +3574,9 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event)
gst_event_unref (parse->priv->close_segment);
parse->priv->close_segment = gst_event_new_new_segment (TRUE,
parse->segment.rate, parse->segment.format,
parse->segment.accum, parse->segment.last_stop, parse->segment.accum);
parse->segment.rate, parse->segment.applied_rate,
parse->segment.format, parse->segment.accum, parse->segment.last_stop,
parse->segment.accum);
/* keep track of our last_stop */
seeksegment.accum = parse->segment.last_stop;
......@@ -3592,6 +3598,7 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event)
/* This will be sent later in _loop() */
parse->priv->pending_segment =
gst_event_new_new_segment (FALSE, parse->segment.rate,
parse->segment.applied_rate,
parse->segment.format, parse->segment.start,
parse->segment.stop, parse->segment.start);
......
......@@ -1448,14 +1448,14 @@ gst_base_sink_configure_segment (GstBaseSink * basesink, GstPad * pad,
/* the newsegment event is needed to bring the buffer timestamps to the
* stream time and to drop samples outside of the playback segment. */
gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
gst_event_parse_new_segment (event, &update, &rate, &arate, &format,
&start, &stop, &time);
/* The segment is protected with both the STREAM_LOCK and the OBJECT_LOCK.
* We protect with the OBJECT_LOCK so that we can use the values to
* safely answer a POSITION query. */
GST_OBJECT_LOCK (basesink);
gst_segment_set_newsegment_full (segment, update, rate, arate, format, start,
gst_segment_set_newsegment (segment, update, rate, arate, format, start,
stop, time);
if (format == GST_FORMAT_TIME) {
......@@ -3398,7 +3398,7 @@ gst_base_sink_event (GstPad * pad, GstEvent * event)
if (G_UNLIKELY (basesink->flushing))
goto flushing;
gst_event_parse_new_segment_full (event, &update, NULL, NULL, NULL, NULL,
gst_event_parse_new_segment (event, &update, NULL, NULL, NULL, NULL,
NULL, NULL);
if (G_UNLIKELY (basesink->priv->received_eos && !update)) {
......
......@@ -757,12 +757,12 @@ gst_base_src_new_seamless_segment (GstBaseSrc * src, gint64 start, gint64 stop,
if (src->priv->close_segment)
gst_event_unref (src->priv->close_segment);
src->priv->close_segment =
gst_event_new_new_segment_full (TRUE,
gst_event_new_new_segment (TRUE,
src->segment.rate, src->segment.applied_rate, src->segment.format,
src->segment.start, src->segment.last_stop, src->segment.time);
}
gst_segment_set_newsegment_full (&src->segment, FALSE, src->segment.rate,
gst_segment_set_newsegment (&src->segment, FALSE, src->segment.rate,
src->segment.applied_rate, src->segment.format, start, stop, position);
if (src->priv->start_segment)
......@@ -770,13 +770,13 @@ gst_base_src_new_seamless_segment (GstBaseSrc * src, gint64 start, gint64 stop,
if (src->segment.rate >= 0.0) {
/* forward, we send data from last_stop to stop */
src->priv->start_segment =
gst_event_new_new_segment_full (FALSE,
gst_event_new_new_segment (FALSE,
src->segment.rate, src->segment.applied_rate, src->segment.format,
src->segment.last_stop, stop, src->segment.time);
} else {
/* reverse, we send data from last_stop to start */
src->priv->start_segment =
gst_event_new_new_segment_full (FALSE,
gst_event_new_new_segment (FALSE,
src->segment.rate, src->segment.applied_rate, src->segment.format,
src->segment.start, src->segment.last_stop, src->segment.time);
}
......@@ -1419,7 +1419,7 @@ gst_base_src_perform_seek (GstBaseSrc * src, GstEvent * event, gboolean unlock)
if (src->priv->close_segment)
gst_event_unref (src->priv->close_segment);
src->priv->close_segment =
gst_event_new_new_segment_full (TRUE,
gst_event_new_new_segment (TRUE,
src->segment.rate, src->segment.applied_rate, src->segment.format,
src->segment.start, src->segment.last_stop, src->segment.time);
gst_event_set_seqnum (src->priv->close_segment, seqnum);
......@@ -1465,13 +1465,13 @@ gst_base_src_perform_seek (GstBaseSrc * src, GstEvent * event, gboolean unlock)
if (seeksegment.rate >= 0.0) {
/* forward, we send data from last_stop to stop */
src->priv->start_segment =
gst_event_new_new_segment_full (FALSE,
gst_event_new_new_segment (FALSE,
seeksegment.rate, seeksegment.applied_rate, seeksegment.format,
seeksegment.last_stop, stop, seeksegment.time);
} else {
/* reverse, we send data from last_stop to start */
src->priv->start_segment =
gst_event_new_new_segment_full (FALSE,
gst_event_new_new_segment (FALSE,
seeksegment.rate, seeksegment.applied_rate, seeksegment.format,
seeksegment.start, seeksegment.last_stop, seeksegment.time);
}
......
......@@ -1655,12 +1655,12 @@ gst_base_transform_sink_eventfunc (GstBaseTransform * trans, GstEvent * event)
gint64 start, stop, time;
gboolean update;
gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
gst_event_parse_new_segment (event, &update, &rate, &arate, &format,
&start, &stop, &time);
trans->have_newsegment = TRUE;
gst_segment_set_newsegment_full (&trans->segment, update, rate, arate,
gst_segment_set_newsegment (&trans->segment, update, rate, arate,
format, start, stop, time);
if (format == GST_FORMAT_TIME) {
......
......@@ -1205,14 +1205,14 @@ gst_collect_pads_event (GstPad * pad, GstEvent * event)
GstFormat format;
gboolean update;
gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
gst_event_parse_new_segment (event, &update, &rate, &arate, &format,
&start, &stop, &time);
GST_DEBUG_OBJECT (data->pad, "got newsegment, start %" GST_TIME_FORMAT
", stop %" GST_TIME_FORMAT, GST_TIME_ARGS (start),
GST_TIME_ARGS (stop));
gst_segment_set_newsegment_full (&data->segment, update, rate, arate,
gst_segment_set_newsegment (&data->segment, update, rate, arate,
format, start, stop, time);
data->abidata.ABI.new_segment = TRUE;
......
......@@ -542,7 +542,7 @@ gst_fd_sink_event (GstBaseSink * sink, GstEvent * event)
{
gint64 start, stop, pos;
GstFormat format;
gst_event_parse_new_segment (event, NULL, NULL, &format, &start,
gst_event_parse_new_segment (event, NULL, NULL, NULL, &format, &start,
&stop, &pos);
if (format == GST_FORMAT_BYTES) {
......
......@@ -546,7 +546,7 @@ gst_file_sink_event (GstBaseSink * sink, GstEvent * event)
gint64 start, stop, pos;
GstFormat format;
gst_event_parse_new_segment (event, NULL, NULL, &format, &start,
gst_event_parse_new_segment (event, NULL, NULL, NULL, &format, &start,
&stop, &pos);
if (format == GST_FORMAT_BYTES) {
......
......@@ -247,7 +247,7 @@ gst_funnel_sink_chain (GstPad * pad, GstBuffer * buffer)
if (fpad->segment.format == GST_FORMAT_UNDEFINED) {
GST_WARNING_OBJECT (funnel, "Got buffer without segment,"
" setting segment [0,inf[");
gst_segment_set_newsegment_full (&fpad->segment, FALSE, 1.0, 1.0,
gst_segment_set_newsegment (&fpad->segment, FALSE, 1.0, 1.0,
GST_FORMAT_TIME, 0, -1, 0);
}
......@@ -263,7 +263,7 @@ gst_funnel_sink_chain (GstPad * pad, GstBuffer * buffer)
}
if (!funnel->has_segment) {
event = gst_event_new_new_segment_full (FALSE, 1.0, 1.0, GST_FORMAT_TIME,
event = gst_event_new_new_segment (FALSE, 1.0, 1.0, GST_FORMAT_TIME,
0, -1, 0);
funnel->has_segment = TRUE;
}
......@@ -321,11 +321,11 @@ gst_funnel_sink_event (GstPad * pad, GstEvent * event)
gint64 stop;
gint64 time;
gst_event_parse_new_segment_full (event, &update, &rate, &arate,
gst_event_parse_new_segment (event, &update, &rate, &arate,
&format, &start, &stop, &time);
GST_OBJECT_LOCK (funnel);
gst_segment_set_newsegment_full (&fpad->segment, update, rate, arate,
gst_segment_set_newsegment (&fpad->segment, update, rate, arate,
format, start, stop, time);
GST_OBJECT_UNLOCK (funnel);
......
......@@ -354,11 +354,11 @@ gst_identity_event (GstBaseTransform * trans, GstEvent * event)
GstEvent *news;
GstFormat format;
gst_event_parse_new_segment (event, NULL, NULL, &format, NULL, NULL,
gst_event_parse_new_segment (event, NULL, NULL, NULL, &format, NULL, NULL,
NULL);
/* This is the first newsegment, send out a (0, -1) newsegment */
news = gst_event_new_new_segment (TRUE, 1.0, format, 0, -1, 0);
news = gst_event_new_new_segment (TRUE, 1.0, 1.0, format, 0, -1, 0);
gst_pad_event_default (trans->sinkpad, news);
}
......
......@@ -400,7 +400,7 @@ gst_selector_pad_event (GstPad * pad, GstEvent * event)
gdouble rate, arate;
gint64 start, stop, time;
gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
gst_event_parse_new_segment (event, &update, &rate, &arate, &format,
&start, &stop, &time);
GST_DEBUG_OBJECT (pad,
......@@ -411,7 +411,7 @@ gst_selector_pad_event (GstPad * pad, GstEvent * event)
GST_INPUT_SELECTOR_LOCK (sel);
GST_OBJECT_LOCK (selpad);
gst_segment_set_newsegment_full (&selpad->segment, update,
gst_segment_set_newsegment (&selpad->segment, update,
rate, arate, format, start, stop, time);
GST_OBJECT_UNLOCK (selpad);
......@@ -591,7 +591,7 @@ gst_selector_pad_chain (GstPad * pad, GstBuffer * buf)
cseg->start, cseg->stop, cseg->time);
/* create update segment */
close_event = gst_event_new_new_segment_full (TRUE, cseg->rate,
close_event = gst_event_new_new_segment (TRUE, cseg->rate,
cseg->applied_rate, cseg->format, cseg->start, cseg->stop, cseg->time);
sel->pending_close = FALSE;
......@@ -605,7 +605,7 @@ gst_selector_pad_chain (GstPad * pad, GstBuffer * buf)
G_GINT64_FORMAT, FALSE, seg->rate, seg->applied_rate, seg->format,
seg->start, seg->stop, seg->time);
start_event = gst_event_new_new_segment_full (FALSE, seg->rate,
start_event = gst_event_new_new_segment (FALSE, seg->rate,
seg->applied_rate, seg->format, seg->start, seg->stop, seg->time);
selpad->segment_pending = FALSE;
......
......@@ -878,7 +878,7 @@ apply_segment (GstMultiQueue * mq, GstSingleQueue * sq, GstEvent * event,
gdouble rate, arate;
gint64 start, stop, time;
gst_event_parse_new_segment_full (event, &update, &rate, &arate,
gst_event_parse_new_segment (event, &update, &rate, &arate,
&format, &start, &stop, &time);
/* now configure the values, we use these to track timestamps on the
......@@ -895,7 +895,7 @@ apply_segment (GstMultiQueue * mq, GstSingleQueue * sq, GstEvent * event,
GST_MULTI_QUEUE_MUTEX_LOCK (mq);
gst_segment_set_newsegment_full (segment, update,
gst_segment_set_newsegment (segment, update,
rate, arate, format, start, stop, time);
if (segment == &sq->sink_segment)
......
......@@ -422,7 +422,7 @@ gst_output_selector_switch (GstOutputSelector * osel)
} else {
start = position = seg->last_stop;
}
ev = gst_event_new_new_segment (TRUE, seg->rate,
ev = gst_event_new_new_segment (TRUE, seg->rate, seg->applied_rate,
seg->format, start, seg->stop, position);
if (!gst_pad_push_event (osel->active_srcpad, ev)) {
GST_WARNING_OBJECT (osel,
......@@ -548,7 +548,7 @@ gst_output_selector_handle_sink_event (GstPad * pad, GstEvent * event)
gdouble rate, arate;
gint64 start, stop, time;
gst_event_parse_new_segment_full (event, &update, &rate, &arate, &format,
gst_event_parse_new_segment (event, &update, &rate, &arate, &format,
&start, &stop, &time);
GST_DEBUG_OBJECT (sel,
......@@ -556,7 +556,7 @@ gst_output_selector_handle_sink_event (GstPad * pad, GstEvent * event)
"format %d, " "%" G_GINT64_FORMAT " -- %" G_GINT64_FORMAT ", time %"
G_GINT64_FORMAT, update, rate, arate, format, start, stop, time);
gst_segment_set_newsegment_full (&sel->segment, update,
gst_segment_set_newsegment (&sel->segment, update,
rate, arate, format, start, stop, time);
/* Send newsegment to all src pads */
......
......@@ -575,7 +575,7 @@ apply_segment (GstQueue * queue, GstEvent * event, GstSegment * segment,
gdouble rate, arate;
gint64 start, stop, time;
gst_event_parse_new_segment_full (event, &update, &rate, &arate,
gst_event_parse_new_segment (event, &update, &rate, &arate,
&format, &start, &stop, &time);
/* now configure the values, we use these to track timestamps on the
......@@ -589,7 +589,7 @@ apply_segment (GstQueue * queue, GstEvent * event, GstSegment * segment,
stop = -1;
time = 0;
}
gst_segment_set_newsegment_full (segment, update,
gst_segment_set_newsegment (segment, update,
rate, arate, format, start, stop, time);
if (sink)
......@@ -1065,14 +1065,14 @@ gst_queue_push_newsegment (GstQueue * queue)
s = &queue->src_segment;
if (s->accum != 0) {
event = gst_event_new_new_segment_full (FALSE, 1.0, 1.0, s->format, 0,
event = gst_event_new_new_segment (FALSE, 1.0, 1.0, s->format, 0,
s->accum, 0);
GST_CAT_LOG_OBJECT (queue_dataflow, queue,
"pushing accum newsegment event");
gst_pad_push_event (queue->srcpad, event);
}
event = gst_event_new_new_segment_full (FALSE, s->rate, s->applied_rate,
event = gst_event_new_new_segment (FALSE, s->rate, s->applied_rate,
s->format, s->start, s->stop, s->time);
GST_CAT_LOG_OBJECT (queue_dataflow, queue, "pushing real newsegment event");
gst_pad_push_event (queue->srcpad, event);
......
......@@ -691,7 +691,7 @@ apply_segment (GstQueue2 * queue, GstEvent * event, GstSegment * segment,
gdouble rate, arate;
gint64 start, stop, time;
gst_event_parse_new_segment_full (event, &update, &rate, &arate,
gst_event_parse_new_segment (event, &update, &rate, &arate,
&format, &start, &stop, &time);
GST_DEBUG_OBJECT (queue,
......@@ -720,7 +720,7 @@ apply_segment (GstQueue2 * queue, GstEvent * event, GstSegment * segment,
stop = -1;
time = 0;
}
gst_segment_set_newsegment_full (segment, update,
gst_segment_set_newsegment (segment, update,
rate, arate, format, start, stop, time);
GST_DEBUG_OBJECT (queue,
......
......@@ -104,7 +104,8 @@ GST_START_TEST (test_clipping)
GST_DEBUG ("sending segment");
segment = gst_event_new_new_segment (FALSE,
1.0, GST_FORMAT_TIME, 1 * GST_SECOND, 5 * GST_SECOND, 1 * GST_SECOND);
1.0, 1.0, GST_FORMAT_TIME, 1 * GST_SECOND, 5 * GST_SECOND,
1 * GST_SECOND);
eret = gst_pad_send_event (sinkpad, segment);
fail_if (eret == FALSE);
......@@ -263,7 +264,8 @@ GST_START_TEST (test_preroll_sync)
GST_DEBUG ("sending segment");
segment = gst_event_new_new_segment (FALSE,
1.0, GST_FORMAT_TIME, 0 * GST_SECOND, 102 * GST_SECOND, 0 * GST_SECOND);
1.0, 1.0, GST_FORMAT_TIME, 0 * GST_SECOND, 102 * GST_SECOND,
0 * GST_SECOND);
eret = gst_pad_send_event (sinkpad, segment);
fail_if (eret == FALSE);
......@@ -423,7 +425,8 @@ GST_START_TEST (test_eos)
GST_DEBUG ("sending segment");
segment = gst_event_new_new_segment (FALSE,
1.0, GST_FORMAT_TIME, 0 * GST_SECOND, 2 * GST_SECOND, 0 * GST_SECOND);
1.0, 1.0, GST_FORMAT_TIME, 0 * GST_SECOND, 2 * GST_SECOND,
0 * GST_SECOND);
eret = gst_pad_send_event (sinkpad, segment);
fail_if (eret == TRUE);
......@@ -468,7 +471,8 @@ GST_START_TEST (test_eos)
GST_DEBUG ("sending segment");
segment = gst_event_new_new_segment (FALSE,
1.0, GST_FORMAT_TIME, 0 * GST_SECOND, 2 * GST_SECOND, 0 * GST_SECOND);