summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2011-05-09 17:51:07 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2011-05-09 17:51:07 +0200
commitc07b57fc05fd75bf25306c5e4db01895d4f0c821 (patch)
treebf989fa9fbdd05aa91bcaf865c57cb4639a8b05d /libs
parentd63829fc9a700b557ad67ebf60c284f3416b4fc2 (diff)
segment: remove _full version
Rename the _full versions of the functions to the normal function names.
Diffstat (limited to 'libs')
-rw-r--r--libs/gst/base/gstbaseparse.c27
-rw-r--r--libs/gst/base/gstbasesink.c6
-rw-r--r--libs/gst/base/gstbasesrc.c14
-rw-r--r--libs/gst/base/gstbasetransform.c4
-rw-r--r--libs/gst/base/gstcollectpads.c4
5 files changed, 31 insertions, 24 deletions
diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c
index fd6eaea34..a1bd393ee 100644
--- a/libs/gst/base/gstbaseparse.c
+++ b/libs/gst/base/gstbaseparse.c
@@ -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);
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 34aac611f..4e67fc5b5 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -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)) {
diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index fbf17a2a1..58a3cf1b5 100644
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -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);
}
diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index a7f504bad..21fb22bed 100644
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -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) {
diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c
index f39a1fbc8..1e4498158 100644
--- a/libs/gst/base/gstcollectpads.c
+++ b/libs/gst/base/gstcollectpads.c
@@ -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;