projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d167c32
)
gst: Rename gst_toc_entry_type_to_string() to gst_toc_entry_type_get_nick()
author
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Tue, 15 May 2012 14:38:30 +0000
(16:38 +0200)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Tue, 15 May 2012 14:38:30 +0000
(16:38 +0200)
It's more consistent.
docs/gst/gstreamer-sections.txt
patch
|
blob
|
history
gst/gsttoc.c
patch
|
blob
|
history
gst/gsttoc.h
patch
|
blob
|
history
tools/gst-launch.c
patch
|
blob
|
history
win32/common/libgstreamer.def
patch
|
blob
|
history
diff --git
a/docs/gst/gstreamer-sections.txt
b/docs/gst/gstreamer-sections.txt
index
d9cb95f
..
097fa66
100644
(file)
--- a/
docs/gst/gstreamer-sections.txt
+++ b/
docs/gst/gstreamer-sections.txt
@@
-2702,7
+2702,7
@@
gst_toc_copy
gst_toc_find_entry
gst_toc_entry_get_start_stop
gst_toc_entry_set_start_stop
gst_toc_find_entry
gst_toc_entry_get_start_stop
gst_toc_entry_set_start_stop
-gst_toc_entry_type_
to_string
+gst_toc_entry_type_
get_nick
<SUBSECTION Standard>
GST_TYPE_TOC_ENTRY_TYPE
<SUBSECTION Private>
<SUBSECTION Standard>
GST_TYPE_TOC_ENTRY_TYPE
<SUBSECTION Private>
diff --git
a/gst/gsttoc.c
b/gst/gsttoc.c
index
b5c092f
..
a0a4b2d
100644
(file)
--- a/
gst/gsttoc.c
+++ b/
gst/gsttoc.c
@@
-978,7
+978,7
@@
gst_toc_entry_get_start_stop (const GstTocEntry * entry, gint64 * start,
}
/**
}
/**
- * gst_toc_entry_type_
to_string
:
+ * gst_toc_entry_type_
get_nick
:
* @type: a #GstTocEntryType.
*
* Converts @type to a string representation.
* @type: a #GstTocEntryType.
*
* Converts @type to a string representation.
@@
-987,7
+987,7
@@
gst_toc_entry_get_start_stop (const GstTocEntry * entry, gint64 * start,
* Since: 0.11.92
*/
const gchar *
* Since: 0.11.92
*/
const gchar *
-gst_toc_entry_type_
to_string
(GstTocEntryType type)
+gst_toc_entry_type_
get_nick
(GstTocEntryType type)
{
const gchar *entry_types[] = { "chapter", "edition" };
{
const gchar *entry_types[] = { "chapter", "edition" };
diff --git
a/gst/gsttoc.h
b/gst/gsttoc.h
index
60bb28a
..
c08868b
100644
(file)
--- a/
gst/gsttoc.h
+++ b/
gst/gsttoc.h
@@
-105,7
+105,7
@@
GstToc * gst_toc_copy (const GstToc *toc);
void gst_toc_entry_set_start_stop (GstTocEntry *entry, gint64 start, gint64 stop);
gboolean gst_toc_entry_get_start_stop (const GstTocEntry *entry, gint64 *start, gint64 *stop);
void gst_toc_entry_set_start_stop (GstTocEntry *entry, gint64 start, gint64 stop);
gboolean gst_toc_entry_get_start_stop (const GstTocEntry *entry, gint64 *start, gint64 *stop);
-const gchar * gst_toc_entry_type_
to_string
(GstTocEntryType type);
+const gchar * gst_toc_entry_type_
get_nick
(GstTocEntryType type);
G_END_DECLS
G_END_DECLS
diff --git
a/tools/gst-launch.c
b/tools/gst-launch.c
index
7266172
..
d0aa879
100644
(file)
--- a/
tools/gst-launch.c
+++ b/
tools/gst-launch.c
@@
-472,7
+472,7
@@
print_toc_entry (gpointer data, gpointer user_data)
gst_toc_entry_get_start_stop (entry, &start, &stop);
PRINT ("%s%s:", &spc[MAX_INDENT - indent],
gst_toc_entry_get_start_stop (entry, &start, &stop);
PRINT ("%s%s:", &spc[MAX_INDENT - indent],
- gst_toc_entry_type_
to_string
(entry->type));
+ gst_toc_entry_type_
get_nick
(entry->type));
if (GST_CLOCK_TIME_IS_VALID (start)) {
PRINT (" start: %" GST_TIME_FORMAT, GST_TIME_ARGS (start));
}
if (GST_CLOCK_TIME_IS_VALID (start)) {
PRINT (" start: %" GST_TIME_FORMAT, GST_TIME_ARGS (start));
}
diff --git
a/win32/common/libgstreamer.def
b/win32/common/libgstreamer.def
index
7a38249
..
05ce467
100644
(file)
--- a/
win32/common/libgstreamer.def
+++ b/
win32/common/libgstreamer.def
@@
-1127,8
+1127,8
@@
EXPORTS
gst_toc_entry_new
gst_toc_entry_new_with_pad
gst_toc_entry_set_start_stop
gst_toc_entry_new
gst_toc_entry_new_with_pad
gst_toc_entry_set_start_stop
+ gst_toc_entry_type_get_nick
gst_toc_entry_type_get_type
gst_toc_entry_type_get_type
- gst_toc_entry_type_to_string
gst_toc_find_entry
gst_toc_free
gst_toc_new
gst_toc_find_entry
gst_toc_free
gst_toc_new