gst/gstevent.h (gst_event_new_new_segment) (gst_event_parse_new_segment, gst_event_new_buffer_size)

Original commit message from CVS:
2005-11-22  Andy Wingo  <wingo@pobox.com>

* gst/gstevent.h (gst_event_new_new_segment)
(gst_event_parse_new_segment, gst_event_new_buffer_size)
(gst_event_parse_buffer_size, gst_ghost_pad_new_no_target):
Renamed from *_newsegment, *_buffersize, *_notarget.

* scripts/update-funcnames: New script, performs the changes
listed above.
This commit is contained in:
Andy Wingo 2005-11-22 11:48:58 +00:00
parent e9606ada93
commit 19858fd9f0
22 changed files with 78 additions and 43 deletions

View file

@ -1,3 +1,13 @@
2005-11-22 Andy Wingo <wingo@pobox.com>
* gst/gstevent.h (gst_event_new_new_segment)
(gst_event_parse_new_segment, gst_event_new_buffer_size)
(gst_event_parse_buffer_size, gst_ghost_pad_new_no_target):
Renamed from *_newsegment, *_buffersize, *_notarget.
* scripts/update-funcnames: New script, performs the changes
listed above.
2005-11-22 Wim Taymans <wim@fluendo.com> 2005-11-22 Wim Taymans <wim@fluendo.com>
* gst/base/gstbasesink.c: (gst_base_sink_handle_object): * gst/base/gstbasesink.c: (gst_base_sink_handle_object):

View file

@ -65,7 +65,7 @@ GST_START_TEST (create_custom_events)
gboolean update; gboolean update;
event = event =
gst_event_new_newsegment (FALSE, 0.5, GST_FORMAT_TIME, 1, G_MAXINT64, gst_event_new_new_segment (FALSE, 0.5, GST_FORMAT_TIME, 1, G_MAXINT64,
0xdeadbeef); 0xdeadbeef);
fail_if (event == NULL); fail_if (event == NULL);
fail_unless (GST_EVENT_TYPE (event) == GST_EVENT_NEWSEGMENT); fail_unless (GST_EVENT_TYPE (event) == GST_EVENT_NEWSEGMENT);
@ -73,7 +73,7 @@ GST_START_TEST (create_custom_events)
fail_unless (GST_EVENT_IS_DOWNSTREAM (event)); fail_unless (GST_EVENT_IS_DOWNSTREAM (event));
fail_unless (GST_EVENT_IS_SERIALIZED (event)); fail_unless (GST_EVENT_IS_SERIALIZED (event));
gst_event_parse_newsegment (event, &update, &rate, &format, &start, &end, gst_event_parse_new_segment (event, &update, &rate, &format, &start, &end,
&base); &base);
fail_unless (update == FALSE); fail_unless (update == FALSE);
fail_unless (rate == 0.5); fail_unless (rate == 0.5);

View file

@ -119,7 +119,7 @@ GST_START_TEST (test_ghost_pad_notarget)
fail_unless (gst_bin_add (GST_BIN (b1), sink)); fail_unless (gst_bin_add (GST_BIN (b1), sink));
fail_unless (gst_bin_add (GST_BIN (b1), b2)); fail_unless (gst_bin_add (GST_BIN (b1), b2));
srcpad = gst_ghost_pad_new_notarget ("src", GST_PAD_SRC); srcpad = gst_ghost_pad_new_no_target ("src", GST_PAD_SRC);
fail_unless (srcpad != NULL); fail_unless (srcpad != NULL);
sinkpad = gst_element_get_pad (sink, "sink"); sinkpad = gst_element_get_pad (sink, "sink");
fail_unless (sinkpad != NULL); fail_unless (sinkpad != NULL);

View file

@ -63,7 +63,7 @@ Ghostpads
* Creating a ghostpad without a target * Creating a ghostpad without a target
gst_ghost_pad_new_notarget (char *name, GstPadDirection dir) gst_ghost_pad_new_no_target (char *name, GstPadDirection dir)
1) create new GstGhostPad X 1) create new GstGhostPad X
2) X name set to @name 2) X name set to @name

View file

@ -635,18 +635,18 @@ GST_EVENT_MAKE_TYPE
gst_event_copy gst_event_copy
gst_event_get_structure gst_event_get_structure
gst_event_new_buffersize gst_event_new_buffer_size
gst_event_new_custom gst_event_new_custom
gst_event_new_eos gst_event_new_eos
gst_event_new_flush_start gst_event_new_flush_start
gst_event_new_flush_stop gst_event_new_flush_stop
gst_event_new_navigation gst_event_new_navigation
gst_event_new_newsegment gst_event_new_new_segment
gst_event_new_qos gst_event_new_qos
gst_event_new_seek gst_event_new_seek
gst_event_new_tag gst_event_new_tag
gst_event_parse_buffersize gst_event_parse_buffer_size
gst_event_parse_newsegment gst_event_parse_new_segment
gst_event_parse_qos gst_event_parse_qos
gst_event_parse_seek gst_event_parse_seek
gst_event_parse_tag gst_event_parse_tag
@ -712,7 +712,7 @@ gst_format_get_type
<TITLE>GstGhostPad</TITLE> <TITLE>GstGhostPad</TITLE>
GstGhostPad GstGhostPad
gst_ghost_pad_new gst_ghost_pad_new
gst_ghost_pad_new_notarget gst_ghost_pad_new_no_target
gst_ghost_pad_set_target gst_ghost_pad_set_target
gst_ghost_pad_get_target gst_ghost_pad_get_target
<SUBSECTION Standard> <SUBSECTION Standard>

View file

@ -586,7 +586,7 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad,
/* the newsegment event is needed to bring the buffer timestamps to the /* the newsegment event is needed to bring the buffer timestamps to the
* stream time and to drop samples outside of the playback segment. */ * stream time and to drop samples outside of the playback segment. */
gst_event_parse_newsegment (event, &update, &rate, &format, gst_event_parse_new_segment (event, &update, &rate, &format,
&start, &stop, &time); &start, &stop, &time);
basesink->have_newsegment = TRUE; basesink->have_newsegment = TRUE;

View file

@ -449,7 +449,7 @@ gst_base_src_default_newsegment (GstBaseSrc * src)
GST_DEBUG_OBJECT (src, "Sending newsegment from %" G_GINT64_FORMAT GST_DEBUG_OBJECT (src, "Sending newsegment from %" G_GINT64_FORMAT
" to %" G_GINT64_FORMAT, src->segment.start, src->segment.stop); " to %" G_GINT64_FORMAT, src->segment.start, src->segment.stop);
event = gst_event_new_newsegment (FALSE, 1.0, event = gst_event_new_new_segment (FALSE, 1.0,
GST_FORMAT_BYTES, src->segment.start, src->segment.stop, GST_FORMAT_BYTES, src->segment.start, src->segment.stop,
src->segment.start); src->segment.start);

View file

@ -1065,8 +1065,8 @@ gst_base_transform_event (GstPad * pad, GstEvent * event)
gint64 start, stop, time; gint64 start, stop, time;
gboolean update; gboolean update;
gst_event_parse_newsegment (event, &update, &rate, &format, &start, &stop, gst_event_parse_new_segment (event, &update, &rate, &format, &start,
&time); &stop, &time);
gst_segment_set_newsegment (&trans->segment, update, rate, format, start, gst_segment_set_newsegment (&trans->segment, update, rate, format, start,
stop, time); stop, time);

View file

@ -605,7 +605,7 @@ gst_collect_pads_event (GstPad * pad, GstEvent * event)
GstFormat format; GstFormat format;
gboolean update; gboolean update;
gst_event_parse_newsegment (event, &update, &rate, &format, gst_event_parse_new_segment (event, &update, &rate, &format,
&start, &stop, &time); &start, &stop, &time);
gst_segment_set_newsegment (&data->segment, update, rate, format, gst_segment_set_newsegment (&data->segment, update, rate, format,

View file

@ -345,7 +345,7 @@ gst_file_sink_event (GstBaseSink * sink, GstEvent * event)
gint64 soffset, eoffset; gint64 soffset, eoffset;
GstFormat format; GstFormat format;
gst_event_parse_newsegment (event, NULL, NULL, &format, &soffset, gst_event_parse_new_segment (event, NULL, NULL, &format, &soffset,
&eoffset, NULL); &eoffset, NULL);
if (format == GST_FORMAT_BYTES) { if (format == GST_FORMAT_BYTES) {

View file

@ -400,7 +400,7 @@ gst_event_new_eos (void)
} }
/** /**
* gst_event_new_newsegment: * gst_event_new_new_segment:
* @update: is this segment an update to a previous one * @update: is this segment an update to a previous one
* @rate: a new rate for playback * @rate: a new rate for playback
* @format: The format of the segment values * @format: The format of the segment values
@ -429,7 +429,7 @@ gst_event_new_eos (void)
* Returns: A new newsegment event. * Returns: A new newsegment event.
*/ */
GstEvent * GstEvent *
gst_event_new_newsegment (gboolean update, gdouble rate, GstFormat format, gst_event_new_new_segment (gboolean update, gdouble rate, GstFormat format,
gint64 start_value, gint64 stop_value, gint64 stream_time) gint64 start_value, gint64 stop_value, gint64 stream_time)
{ {
g_return_val_if_fail (rate != 0.0, NULL); g_return_val_if_fail (rate != 0.0, NULL);
@ -467,7 +467,7 @@ gst_event_new_newsegment (gboolean update, gdouble rate, GstFormat format,
} }
/** /**
* gst_event_parse_newsegment: * gst_event_parse_new_segment:
* @event: The event to query * @event: The event to query
* @update: A pointer to the update flag of the segment * @update: A pointer to the update flag of the segment
* @rate: A pointer to the rate of the segment * @rate: A pointer to the rate of the segment
@ -479,9 +479,9 @@ gst_event_new_newsegment (gboolean update, gdouble rate, GstFormat format,
* Get the start, stop and format in the newsegment event. * Get the start, stop and format in the newsegment event.
*/ */
void void
gst_event_parse_newsegment (GstEvent * event, gboolean * update, gdouble * rate, gst_event_parse_new_segment (GstEvent * event, gboolean * update,
GstFormat * format, gint64 * start_value, gint64 * stop_value, gdouble * rate, GstFormat * format, gint64 * start_value,
gint64 * stream_time) gint64 * stop_value, gint64 * stream_time)
{ {
const GstStructure *structure; const GstStructure *structure;
@ -542,7 +542,7 @@ gst_event_parse_tag (GstEvent * event, GstTagList ** taglist)
/* buffersize event */ /* buffersize event */
/** /**
* gst_event_new_buffersize: * gst_event_new_buffer_size:
* @format: buffer format * @format: buffer format
* @minsize: minimum buffer size * @minsize: minimum buffer size
* @maxsize: maximum buffer size * @maxsize: maximum buffer size
@ -556,7 +556,7 @@ gst_event_parse_tag (GstEvent * event, GstTagList ** taglist)
* Returns: a new #GstEvent * Returns: a new #GstEvent
*/ */
GstEvent * GstEvent *
gst_event_new_buffersize (GstFormat format, gint64 minsize, gst_event_new_buffer_size (GstFormat format, gint64 minsize,
gint64 maxsize, gboolean async) gint64 maxsize, gboolean async)
{ {
GST_CAT_INFO (GST_CAT_EVENT, GST_CAT_INFO (GST_CAT_EVENT,
@ -573,7 +573,7 @@ gst_event_new_buffersize (GstFormat format, gint64 minsize,
} }
/** /**
* gst_event_parse_buffersize: * gst_event_parse_buffer_size:
* @event: The event to query * @event: The event to query
* @format: A pointer to store the format in * @format: A pointer to store the format in
* @minsize: A pointer to store the minsize in * @minsize: A pointer to store the minsize in
@ -583,7 +583,7 @@ gst_event_new_buffersize (GstFormat format, gint64 minsize,
* Get the format, minsize, maxsize and async-flag in the buffersize event. * Get the format, minsize, maxsize and async-flag in the buffersize event.
*/ */
void void
gst_event_parse_buffersize (GstEvent * event, GstFormat * format, gst_event_parse_buffer_size (GstEvent * event, GstFormat * format,
gint64 * minsize, gint64 * maxsize, gboolean * async) gint64 * minsize, gint64 * maxsize, gboolean * async)
{ {
const GstStructure *structure; const GstStructure *structure;

View file

@ -339,10 +339,10 @@ GstEvent * gst_event_new_flush_stop (void);
GstEvent * gst_event_new_eos (void); GstEvent * gst_event_new_eos (void);
/* newsegment events */ /* newsegment events */
GstEvent* gst_event_new_newsegment (gboolean update, gdouble rate, GstFormat format, GstEvent* gst_event_new_new_segment (gboolean update, gdouble rate, GstFormat format,
gint64 start_value, gint64 stop_value, gint64 start_value, gint64 stop_value,
gint64 stream_time); gint64 stream_time);
void gst_event_parse_newsegment (GstEvent *event, gboolean *update, gdouble *rate, void gst_event_parse_new_segment (GstEvent *event, gboolean *update, gdouble *rate,
GstFormat *format, gint64 *start_value, gint64 *stop_value, GstFormat *format, gint64 *start_value, gint64 *stop_value,
gint64 *stream_time); gint64 *stream_time);
/* tag event */ /* tag event */
@ -350,9 +350,9 @@ GstEvent* gst_event_new_tag (GstTagList *taglist);
void gst_event_parse_tag (GstEvent *event, GstTagList **taglist); void gst_event_parse_tag (GstEvent *event, GstTagList **taglist);
/* buffer */ /* buffer */
GstEvent * gst_event_new_buffersize (GstFormat format, gint64 minsize, gint64 maxsize, GstEvent * gst_event_new_buffer_size (GstFormat format, gint64 minsize, gint64 maxsize,
gboolean async); gboolean async);
void gst_event_parse_buffersize (GstEvent *event, GstFormat *format, gint64 *minsize, void gst_event_parse_buffer_size (GstEvent *event, GstFormat *format, gint64 *minsize,
gint64 *maxsize, gboolean *async); gint64 *maxsize, gboolean *async);
/* QOS events */ /* QOS events */

View file

@ -34,7 +34,7 @@
* are accociated with sink and source pads of the child elements. * are accociated with sink and source pads of the child elements.
* *
* If the target pad is known at creation time, gst_ghost_pad_new() is the * If the target pad is known at creation time, gst_ghost_pad_new() is the
* function to use to get a ghost-pad. Otherwise one can use gst_ghost_pad_new_notarget() * function to use to get a ghost-pad. Otherwise one can use gst_ghost_pad_new_no_target()
* to create the ghost-pad and use gst_ghost_pad_set_target() to establish the * to create the ghost-pad and use gst_ghost_pad_set_target() to establish the
* accociation later on. * accociation later on.
* *
@ -753,7 +753,7 @@ gst_ghost_pad_dispose (GObject * object)
} }
/** /**
* gst_ghost_pad_new_notarget: * gst_ghost_pad_new_no_target:
* @name: the name of the new pad, or NULL to assign a default name. * @name: the name of the new pad, or NULL to assign a default name.
* @dir: the direction of the ghostpad * @dir: the direction of the ghostpad
* *
@ -766,7 +766,7 @@ gst_ghost_pad_dispose (GObject * object)
* Returns: a new #GstPad, or NULL in case of an error. * Returns: a new #GstPad, or NULL in case of an error.
*/ */
GstPad * GstPad *
gst_ghost_pad_new_notarget (const gchar * name, GstPadDirection dir) gst_ghost_pad_new_no_target (const gchar * name, GstPadDirection dir)
{ {
GstPad *ret; GstPad *ret;
@ -801,7 +801,7 @@ gst_ghost_pad_new (const gchar * name, GstPad * target)
g_return_val_if_fail (GST_IS_PAD (target), NULL); g_return_val_if_fail (GST_IS_PAD (target), NULL);
g_return_val_if_fail (!gst_pad_is_linked (target), NULL); g_return_val_if_fail (!gst_pad_is_linked (target), NULL);
if ((ret = gst_ghost_pad_new_notarget (name, GST_PAD_DIRECTION (target)))) { if ((ret = gst_ghost_pad_new_no_target (name, GST_PAD_DIRECTION (target)))) {
g_object_set (G_OBJECT (ret), g_object_set (G_OBJECT (ret),
"template", GST_PAD_PAD_TEMPLATE (target), NULL); "template", GST_PAD_PAD_TEMPLATE (target), NULL);
gst_ghost_pad_set_target (GST_GHOST_PAD (ret), target); gst_ghost_pad_set_target (GST_GHOST_PAD (ret), target);

View file

@ -43,7 +43,7 @@ typedef struct _GstGhostPadClass GstGhostPadClass;
GType gst_ghost_pad_get_type (void); GType gst_ghost_pad_get_type (void);
GstPad* gst_ghost_pad_new (const gchar *name, GstPad *target); GstPad* gst_ghost_pad_new (const gchar *name, GstPad *target);
GstPad* gst_ghost_pad_new_notarget (const gchar *name, GstPadDirection dir); GstPad* gst_ghost_pad_new_no_target (const gchar *name, GstPadDirection dir);
GstPad* gst_ghost_pad_get_target (GstGhostPad *gpad); GstPad* gst_ghost_pad_get_target (GstGhostPad *gpad);
gboolean gst_ghost_pad_set_target (GstGhostPad *gpad, GstPad *newtarget); gboolean gst_ghost_pad_set_target (GstGhostPad *gpad, GstPad *newtarget);

View file

@ -586,7 +586,7 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad,
/* the newsegment event is needed to bring the buffer timestamps to the /* the newsegment event is needed to bring the buffer timestamps to the
* stream time and to drop samples outside of the playback segment. */ * stream time and to drop samples outside of the playback segment. */
gst_event_parse_newsegment (event, &update, &rate, &format, gst_event_parse_new_segment (event, &update, &rate, &format,
&start, &stop, &time); &start, &stop, &time);
basesink->have_newsegment = TRUE; basesink->have_newsegment = TRUE;

View file

@ -449,7 +449,7 @@ gst_base_src_default_newsegment (GstBaseSrc * src)
GST_DEBUG_OBJECT (src, "Sending newsegment from %" G_GINT64_FORMAT GST_DEBUG_OBJECT (src, "Sending newsegment from %" G_GINT64_FORMAT
" to %" G_GINT64_FORMAT, src->segment.start, src->segment.stop); " to %" G_GINT64_FORMAT, src->segment.start, src->segment.stop);
event = gst_event_new_newsegment (FALSE, 1.0, event = gst_event_new_new_segment (FALSE, 1.0,
GST_FORMAT_BYTES, src->segment.start, src->segment.stop, GST_FORMAT_BYTES, src->segment.start, src->segment.stop,
src->segment.start); src->segment.start);

View file

@ -1065,8 +1065,8 @@ gst_base_transform_event (GstPad * pad, GstEvent * event)
gint64 start, stop, time; gint64 start, stop, time;
gboolean update; gboolean update;
gst_event_parse_newsegment (event, &update, &rate, &format, &start, &stop, gst_event_parse_new_segment (event, &update, &rate, &format, &start,
&time); &stop, &time);
gst_segment_set_newsegment (&trans->segment, update, rate, format, start, gst_segment_set_newsegment (&trans->segment, update, rate, format, start,
stop, time); stop, time);

View file

@ -605,7 +605,7 @@ gst_collect_pads_event (GstPad * pad, GstEvent * event)
GstFormat format; GstFormat format;
gboolean update; gboolean update;
gst_event_parse_newsegment (event, &update, &rate, &format, gst_event_parse_new_segment (event, &update, &rate, &format,
&start, &stop, &time); &start, &stop, &time);
gst_segment_set_newsegment (&data->segment, update, rate, format, gst_segment_set_newsegment (&data->segment, update, rate, format,

View file

@ -345,7 +345,7 @@ gst_file_sink_event (GstBaseSink * sink, GstEvent * event)
gint64 soffset, eoffset; gint64 soffset, eoffset;
GstFormat format; GstFormat format;
gst_event_parse_newsegment (event, NULL, NULL, &format, &soffset, gst_event_parse_new_segment (event, NULL, NULL, &format, &soffset,
&eoffset, NULL); &eoffset, NULL);
if (format == GST_FORMAT_BYTES) { if (format == GST_FORMAT_BYTES) {

25
scripts/update-funcnames Executable file
View file

@ -0,0 +1,25 @@
#!/bin/bash
set -e
if test -z "$1" -o -n "$2"; then
echo "Usage: $0 FILE" >&2
exit 1
fi
file=$1
function subst () {
from=$1
to=$2
if grep -q $from $file; then
echo "$file: $from->$to"
perl -i -p -e "s/$from/$to/g" $file
fi
}
subst gst_event_new_newsegment gst_event_new_new_segment
subst gst_event_parse_newsegment gst_event_parse_new_segment
subst gst_event_new_buffersize gst_event_new_buffer_size
subst gst_event_parse_buffersize gst_event_parse_buffer_size
subst gst_ghost_pad_new_notarget gst_ghost_pad_new_no_target

View file

@ -65,7 +65,7 @@ GST_START_TEST (create_custom_events)
gboolean update; gboolean update;
event = event =
gst_event_new_newsegment (FALSE, 0.5, GST_FORMAT_TIME, 1, G_MAXINT64, gst_event_new_new_segment (FALSE, 0.5, GST_FORMAT_TIME, 1, G_MAXINT64,
0xdeadbeef); 0xdeadbeef);
fail_if (event == NULL); fail_if (event == NULL);
fail_unless (GST_EVENT_TYPE (event) == GST_EVENT_NEWSEGMENT); fail_unless (GST_EVENT_TYPE (event) == GST_EVENT_NEWSEGMENT);
@ -73,7 +73,7 @@ GST_START_TEST (create_custom_events)
fail_unless (GST_EVENT_IS_DOWNSTREAM (event)); fail_unless (GST_EVENT_IS_DOWNSTREAM (event));
fail_unless (GST_EVENT_IS_SERIALIZED (event)); fail_unless (GST_EVENT_IS_SERIALIZED (event));
gst_event_parse_newsegment (event, &update, &rate, &format, &start, &end, gst_event_parse_new_segment (event, &update, &rate, &format, &start, &end,
&base); &base);
fail_unless (update == FALSE); fail_unless (update == FALSE);
fail_unless (rate == 0.5); fail_unless (rate == 0.5);

View file

@ -119,7 +119,7 @@ GST_START_TEST (test_ghost_pad_notarget)
fail_unless (gst_bin_add (GST_BIN (b1), sink)); fail_unless (gst_bin_add (GST_BIN (b1), sink));
fail_unless (gst_bin_add (GST_BIN (b1), b2)); fail_unless (gst_bin_add (GST_BIN (b1), b2));
srcpad = gst_ghost_pad_new_notarget ("src", GST_PAD_SRC); srcpad = gst_ghost_pad_new_no_target ("src", GST_PAD_SRC);
fail_unless (srcpad != NULL); fail_unless (srcpad != NULL);
sinkpad = gst_element_get_pad (sink, "sink"); sinkpad = gst_element_get_pad (sink, "sink");
fail_unless (sinkpad != NULL); fail_unless (sinkpad != NULL);