summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2005-11-22 11:48:58 +0000
committerAndy Wingo <wingo@pobox.com>2005-11-22 11:48:58 +0000
commit19858fd9f0c33a6bdf66862dac51c788ee540f4f (patch)
treed9a67454ffec69895712b0bc7f07b13a482feed0
parente9606ada9330cc6943470c1417f8edaf46127781 (diff)
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.
-rw-r--r--ChangeLog10
-rw-r--r--check/gst/gstevent.c4
-rw-r--r--check/gst/gstghostpad.c2
-rw-r--r--docs/design/part-gstghostpad.txt2
-rw-r--r--docs/gst/gstreamer-sections.txt10
-rw-r--r--gst/base/gstbasesink.c2
-rw-r--r--gst/base/gstbasesrc.c2
-rw-r--r--gst/base/gstbasetransform.c4
-rw-r--r--gst/base/gstcollectpads.c2
-rw-r--r--gst/elements/gstfilesink.c2
-rw-r--r--gst/gstevent.c20
-rw-r--r--gst/gstevent.h8
-rw-r--r--gst/gstghostpad.c8
-rw-r--r--gst/gstghostpad.h2
-rw-r--r--libs/gst/base/gstbasesink.c2
-rw-r--r--libs/gst/base/gstbasesrc.c2
-rw-r--r--libs/gst/base/gstbasetransform.c4
-rw-r--r--libs/gst/base/gstcollectpads.c2
-rw-r--r--plugins/elements/gstfilesink.c2
-rwxr-xr-xscripts/update-funcnames25
-rw-r--r--tests/check/gst/gstevent.c4
-rw-r--r--tests/check/gst/gstghostpad.c2
22 files changed, 78 insertions, 43 deletions
diff --git a/ChangeLog b/ChangeLog
index c9ce5118e9..087f060996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* gst/base/gstbasesink.c: (gst_base_sink_handle_object):
diff --git a/check/gst/gstevent.c b/check/gst/gstevent.c
index eb9566955f..6cc792cb5b 100644
--- a/check/gst/gstevent.c
+++ b/check/gst/gstevent.c
@@ -65,7 +65,7 @@ GST_START_TEST (create_custom_events)
gboolean update;
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);
fail_if (event == NULL);
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_SERIALIZED (event));
- gst_event_parse_newsegment (event, &update, &rate, &format, &start, &end,
+ gst_event_parse_new_segment (event, &update, &rate, &format, &start, &end,
&base);
fail_unless (update == FALSE);
fail_unless (rate == 0.5);
diff --git a/check/gst/gstghostpad.c b/check/gst/gstghostpad.c
index 6572c4dc25..6dec9014b1 100644
--- a/check/gst/gstghostpad.c
+++ b/check/gst/gstghostpad.c
@@ -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), 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);
sinkpad = gst_element_get_pad (sink, "sink");
fail_unless (sinkpad != NULL);
diff --git a/docs/design/part-gstghostpad.txt b/docs/design/part-gstghostpad.txt
index cc49b79132..242f89718d 100644
--- a/docs/design/part-gstghostpad.txt
+++ b/docs/design/part-gstghostpad.txt
@@ -63,7 +63,7 @@ Ghostpads
* 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
2) X name set to @name
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index 72f49d0328..f002619ad5 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -635,18 +635,18 @@ GST_EVENT_MAKE_TYPE
gst_event_copy
gst_event_get_structure
-gst_event_new_buffersize
+gst_event_new_buffer_size
gst_event_new_custom
gst_event_new_eos
gst_event_new_flush_start
gst_event_new_flush_stop
gst_event_new_navigation
-gst_event_new_newsegment
+gst_event_new_new_segment
gst_event_new_qos
gst_event_new_seek
gst_event_new_tag
-gst_event_parse_buffersize
-gst_event_parse_newsegment
+gst_event_parse_buffer_size
+gst_event_parse_new_segment
gst_event_parse_qos
gst_event_parse_seek
gst_event_parse_tag
@@ -712,7 +712,7 @@ gst_format_get_type
<TITLE>GstGhostPad</TITLE>
GstGhostPad
gst_ghost_pad_new
-gst_ghost_pad_new_notarget
+gst_ghost_pad_new_no_target
gst_ghost_pad_set_target
gst_ghost_pad_get_target
<SUBSECTION Standard>
diff --git a/gst/base/gstbasesink.c b/gst/base/gstbasesink.c
index 646b72f90b..956d54712a 100644
--- a/gst/base/gstbasesink.c
+++ b/gst/base/gstbasesink.c
@@ -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
* 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);
basesink->have_newsegment = TRUE;
diff --git a/gst/base/gstbasesrc.c b/gst/base/gstbasesrc.c
index a2f72507a5..146d9ca5ff 100644
--- a/gst/base/gstbasesrc.c
+++ b/gst/base/gstbasesrc.c
@@ -449,7 +449,7 @@ gst_base_src_default_newsegment (GstBaseSrc * src)
GST_DEBUG_OBJECT (src, "Sending newsegment from %" G_GINT64_FORMAT
" 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,
src->segment.start);
diff --git a/gst/base/gstbasetransform.c b/gst/base/gstbasetransform.c
index 4eb9595fa1..33326af363 100644
--- a/gst/base/gstbasetransform.c
+++ b/gst/base/gstbasetransform.c
@@ -1065,8 +1065,8 @@ gst_base_transform_event (GstPad * pad, GstEvent * event)
gint64 start, stop, time;
gboolean update;
- gst_event_parse_newsegment (event, &update, &rate, &format, &start, &stop,
- &time);
+ gst_event_parse_new_segment (event, &update, &rate, &format, &start,
+ &stop, &time);
gst_segment_set_newsegment (&trans->segment, update, rate, format, start,
stop, time);
diff --git a/gst/base/gstcollectpads.c b/gst/base/gstcollectpads.c
index d3a48fcbdf..f06a42e853 100644
--- a/gst/base/gstcollectpads.c
+++ b/gst/base/gstcollectpads.c
@@ -605,7 +605,7 @@ gst_collect_pads_event (GstPad * pad, GstEvent * event)
GstFormat format;
gboolean update;
- gst_event_parse_newsegment (event, &update, &rate, &format,
+ gst_event_parse_new_segment (event, &update, &rate, &format,
&start, &stop, &time);
gst_segment_set_newsegment (&data->segment, update, rate, format,
diff --git a/gst/elements/gstfilesink.c b/gst/elements/gstfilesink.c
index 42077db414..a993d2e79b 100644
--- a/gst/elements/gstfilesink.c
+++ b/gst/elements/gstfilesink.c
@@ -345,7 +345,7 @@ gst_file_sink_event (GstBaseSink * sink, GstEvent * event)
gint64 soffset, eoffset;
GstFormat format;
- gst_event_parse_newsegment (event, NULL, NULL, &format, &soffset,
+ gst_event_parse_new_segment (event, NULL, NULL, &format, &soffset,
&eoffset, NULL);
if (format == GST_FORMAT_BYTES) {
diff --git a/gst/gstevent.c b/gst/gstevent.c
index e7779ce91f..d8f38e8f89 100644
--- a/gst/gstevent.c
+++ b/gst/gstevent.c
@@ -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
* @rate: a new rate for playback
* @format: The format of the segment values
@@ -429,7 +429,7 @@ gst_event_new_eos (void)
* Returns: A new newsegment event.
*/
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)
{
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
* @update: A pointer to the update flag 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.
*/
void
-gst_event_parse_newsegment (GstEvent * event, gboolean * update, gdouble * rate,
- GstFormat * format, gint64 * start_value, gint64 * stop_value,
- gint64 * stream_time)
+gst_event_parse_new_segment (GstEvent * event, gboolean * update,
+ gdouble * rate, GstFormat * format, gint64 * start_value,
+ gint64 * stop_value, gint64 * stream_time)
{
const GstStructure *structure;
@@ -542,7 +542,7 @@ gst_event_parse_tag (GstEvent * event, GstTagList ** taglist)
/* buffersize event */
/**
- * gst_event_new_buffersize:
+ * gst_event_new_buffer_size:
* @format: buffer format
* @minsize: minimum buffer size
* @maxsize: maximum buffer size
@@ -556,7 +556,7 @@ gst_event_parse_tag (GstEvent * event, GstTagList ** taglist)
* Returns: a new #GstEvent
*/
GstEvent *
-gst_event_new_buffersize (GstFormat format, gint64 minsize,
+gst_event_new_buffer_size (GstFormat format, gint64 minsize,
gint64 maxsize, gboolean async)
{
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
* @format: A pointer to store the format 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.
*/
void
-gst_event_parse_buffersize (GstEvent * event, GstFormat * format,
+gst_event_parse_buffer_size (GstEvent * event, GstFormat * format,
gint64 * minsize, gint64 * maxsize, gboolean * async)
{
const GstStructure *structure;
diff --git a/gst/gstevent.h b/gst/gstevent.h
index 41c48f1fe9..b9b4e0f9c1 100644
--- a/gst/gstevent.h
+++ b/gst/gstevent.h
@@ -339,10 +339,10 @@ GstEvent * gst_event_new_flush_stop (void);
GstEvent * gst_event_new_eos (void);
/* 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 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,
gint64 *stream_time);
/* tag event */
@@ -350,9 +350,9 @@ GstEvent* gst_event_new_tag (GstTagList *taglist);
void gst_event_parse_tag (GstEvent *event, GstTagList **taglist);
/* 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);
-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);
/* QOS events */
diff --git a/gst/gstghostpad.c b/gst/gstghostpad.c
index 9dcdf8c7fb..2f2fe6649c 100644
--- a/gst/gstghostpad.c
+++ b/gst/gstghostpad.c
@@ -34,7 +34,7 @@
* 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
- * 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
* 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.
* @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.
*/
GstPad *
-gst_ghost_pad_new_notarget (const gchar * name, GstPadDirection dir)
+gst_ghost_pad_new_no_target (const gchar * name, GstPadDirection dir)
{
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_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),
"template", GST_PAD_PAD_TEMPLATE (target), NULL);
gst_ghost_pad_set_target (GST_GHOST_PAD (ret), target);
diff --git a/gst/gstghostpad.h b/gst/gstghostpad.h
index 24a8ba4a90..6f83bd0552 100644
--- a/gst/gstghostpad.h
+++ b/gst/gstghostpad.h
@@ -43,7 +43,7 @@ typedef struct _GstGhostPadClass GstGhostPadClass;
GType gst_ghost_pad_get_type (void);
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);
gboolean gst_ghost_pad_set_target (GstGhostPad *gpad, GstPad *newtarget);
diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index 646b72f90b..956d54712a 100644
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -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
* 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);
basesink->have_newsegment = TRUE;
diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index a2f72507a5..146d9ca5ff 100644
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -449,7 +449,7 @@ gst_base_src_default_newsegment (GstBaseSrc * src)
GST_DEBUG_OBJECT (src, "Sending newsegment from %" G_GINT64_FORMAT
" 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,
src->segment.start);
diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index 4eb9595fa1..33326af363 100644
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -1065,8 +1065,8 @@ gst_base_transform_event (GstPad * pad, GstEvent * event)
gint64 start, stop, time;
gboolean update;
- gst_event_parse_newsegment (event, &update, &rate, &format, &start, &stop,
- &time);
+ gst_event_parse_new_segment (event, &update, &rate, &format, &start,
+ &stop, &time);
gst_segment_set_newsegment (&trans->segment, update, rate, format, start,
stop, time);
diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c
index d3a48fcbdf..f06a42e853 100644
--- a/libs/gst/base/gstcollectpads.c
+++ b/libs/gst/base/gstcollectpads.c
@@ -605,7 +605,7 @@ gst_collect_pads_event (GstPad * pad, GstEvent * event)
GstFormat format;
gboolean update;
- gst_event_parse_newsegment (event, &update, &rate, &format,
+ gst_event_parse_new_segment (event, &update, &rate, &format,
&start, &stop, &time);
gst_segment_set_newsegment (&data->segment, update, rate, format,
diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c
index 42077db414..a993d2e79b 100644
--- a/plugins/elements/gstfilesink.c
+++ b/plugins/elements/gstfilesink.c
@@ -345,7 +345,7 @@ gst_file_sink_event (GstBaseSink * sink, GstEvent * event)
gint64 soffset, eoffset;
GstFormat format;
- gst_event_parse_newsegment (event, NULL, NULL, &format, &soffset,
+ gst_event_parse_new_segment (event, NULL, NULL, &format, &soffset,
&eoffset, NULL);
if (format == GST_FORMAT_BYTES) {
diff --git a/scripts/update-funcnames b/scripts/update-funcnames
new file mode 100755
index 0000000000..10914f0e2b
--- /dev/null
+++ b/scripts/update-funcnames
@@ -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
diff --git a/tests/check/gst/gstevent.c b/tests/check/gst/gstevent.c
index eb9566955f..6cc792cb5b 100644
--- a/tests/check/gst/gstevent.c
+++ b/tests/check/gst/gstevent.c
@@ -65,7 +65,7 @@ GST_START_TEST (create_custom_events)
gboolean update;
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);
fail_if (event == NULL);
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_SERIALIZED (event));
- gst_event_parse_newsegment (event, &update, &rate, &format, &start, &end,
+ gst_event_parse_new_segment (event, &update, &rate, &format, &start, &end,
&base);
fail_unless (update == FALSE);
fail_unless (rate == 0.5);
diff --git a/tests/check/gst/gstghostpad.c b/tests/check/gst/gstghostpad.c
index 6572c4dc25..6dec9014b1 100644
--- a/tests/check/gst/gstghostpad.c
+++ b/tests/check/gst/gstghostpad.c
@@ -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), 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);
sinkpad = gst_element_get_pad (sink, "sink");
fail_unless (sinkpad != NULL);