mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 04:22:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gsttagsetter.*: (gst_tag_setter_merge_tags) (gst_tag_setter_add_tags, gst_tag_setter_add_tag_values) (gst_tag_set...

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

patch by: Torsten Schoenfeld <kaffeetisch gmx de>

* gst/gsttagsetter.h:
* gst/gsttagsetter.c: (gst_tag_setter_merge_tags)
(gst_tag_setter_add_tags, gst_tag_setter_add_tag_values)
(gst_tag_setter_add_tag_valist)
(gst_tag_setter_add_tag_valist_values): Renamed from _merge, _add,
_add_values, _add_valist, and _add_valist_values. Since this is an
interface the function suffixes should be more explicit so
language binding don't end up with element.add_valist ->
gst_tag_setter_add_valist, for example. Fixes #322069.
This commit is contained in:
Torsten Schoenfeld 2005-11-22 12:20:04 +00:00 committed by Andy Wingo
parent a15da5e5e4
commit c9bce50d33
3 changed files with 51 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2005-11-22 Andy Wingo <wingo@pobox.com>
patch by: Torsten Schoenfeld <kaffeetisch gmx de>
* gst/gsttagsetter.h:
* gst/gsttagsetter.c: (gst_tag_setter_merge_tags)
(gst_tag_setter_add_tags, gst_tag_setter_add_tag_values)
(gst_tag_setter_add_tag_valist)
(gst_tag_setter_add_tag_valist_values): Renamed from _merge, _add,
_add_values, _add_valist, and _add_valist_values. Since this is an
interface the function suffixes should be more explicit so
language binding don't end up with element.add_valist ->
gst_tag_setter_add_valist, for example. Fixes #322069.
2005-11-22 Jan Schmidt <thaytan@mad.scientist.com> 2005-11-22 Jan Schmidt <thaytan@mad.scientist.com>
* check/gst/gstcaps.c: (GST_START_TEST): * check/gst/gstcaps.c: (GST_START_TEST):

26
gst/gsttagsetter.c
View file

@ -107,7 +107,7 @@ gst_tag_setter_get_data (GstTagSetter * setter)
} }
/** /**
* gst_tag_setter_merge: * gst_tag_setter_merge_tags:
* @setter: a #GstTagSetter * @setter: a #GstTagSetter
* @list: a tag list to merge from * @list: a tag list to merge from
* @mode: the mode to merge with * @mode: the mode to merge with
@ -115,7 +115,7 @@ gst_tag_setter_get_data (GstTagSetter * setter)
* Merges the given list into the setter's list using the given mode. * Merges the given list into the setter's list using the given mode.
*/ */
void void
gst_tag_setter_merge (GstTagSetter * setter, const GstTagList * list, gst_tag_setter_merge_tags (GstTagSetter * setter, const GstTagList * list,
GstTagMergeMode mode) GstTagMergeMode mode)
{ {
GstTagData *data; GstTagData *data;
@ -132,7 +132,7 @@ gst_tag_setter_merge (GstTagSetter * setter, const GstTagList * list,
} }
/** /**
* gst_tag_setter_add: * gst_tag_setter_add_tags:
* @setter: a #GstTagSetter * @setter: a #GstTagSetter
* @mode: the mode to use * @mode: the mode to use
* @tag: tag to set * @tag: tag to set
@ -142,7 +142,7 @@ gst_tag_setter_merge (GstTagSetter * setter, const GstTagList * list,
* The list must be terminated with NULL. * The list must be terminated with NULL.
*/ */
void void
gst_tag_setter_add (GstTagSetter * setter, GstTagMergeMode mode, gst_tag_setter_add_tags (GstTagSetter * setter, GstTagMergeMode mode,
const gchar * tag, ...) const gchar * tag, ...)
{ {
va_list args; va_list args;
@ -151,12 +151,12 @@ gst_tag_setter_add (GstTagSetter * setter, GstTagMergeMode mode,
g_return_if_fail (GST_TAG_MODE_IS_VALID (mode)); g_return_if_fail (GST_TAG_MODE_IS_VALID (mode));
va_start (args, tag); va_start (args, tag);
gst_tag_setter_add_valist (setter, mode, tag, args); gst_tag_setter_add_tag_valist (setter, mode, tag, args);
va_end (args); va_end (args);
} }
/** /**
* gst_tag_setter_add_values: * gst_tag_setter_add_tag_values:
* @setter: a #GstTagSetter * @setter: a #GstTagSetter
* @mode: the mode to use * @mode: the mode to use
* @tag: tag to set * @tag: tag to set
@ -166,7 +166,7 @@ gst_tag_setter_add (GstTagSetter * setter, GstTagMergeMode mode,
* The list must be terminated with NULL. * The list must be terminated with NULL.
*/ */
void void
gst_tag_setter_add_values (GstTagSetter * setter, GstTagMergeMode mode, gst_tag_setter_add_tag_values (GstTagSetter * setter, GstTagMergeMode mode,
const gchar * tag, ...) const gchar * tag, ...)
{ {
va_list args; va_list args;
@ -175,12 +175,12 @@ gst_tag_setter_add_values (GstTagSetter * setter, GstTagMergeMode mode,
g_return_if_fail (GST_TAG_MODE_IS_VALID (mode)); g_return_if_fail (GST_TAG_MODE_IS_VALID (mode));
va_start (args, tag); va_start (args, tag);
gst_tag_setter_add_valist_values (setter, mode, tag, args); gst_tag_setter_add_tag_valist_values (setter, mode, tag, args);
va_end (args); va_end (args);
} }
/** /**
* gst_tag_setter_add_valist: * gst_tag_setter_tag_add_valist:
* @setter: a #GstTagSetter * @setter: a #GstTagSetter
* @mode: the mode to use * @mode: the mode to use
* @tag: tag to set * @tag: tag to set
@ -190,7 +190,7 @@ gst_tag_setter_add_values (GstTagSetter * setter, GstTagMergeMode mode,
* The list must be terminated with NULL. * The list must be terminated with NULL.
*/ */
void void
gst_tag_setter_add_valist (GstTagSetter * setter, GstTagMergeMode mode, gst_tag_setter_add_tag_valist (GstTagSetter * setter, GstTagMergeMode mode,
const gchar * tag, va_list var_args) const gchar * tag, va_list var_args)
{ {
GstTagData *data; GstTagData *data;
@ -206,7 +206,7 @@ gst_tag_setter_add_valist (GstTagSetter * setter, GstTagMergeMode mode,
} }
/** /**
* gst_tag_setter_add_valist_values: * gst_tag_setter_add_tag_valist_values:
* @setter: a #GstTagSetter * @setter: a #GstTagSetter
* @mode: the mode to use * @mode: the mode to use
* @tag: tag to set * @tag: tag to set
@ -216,8 +216,8 @@ gst_tag_setter_add_valist (GstTagSetter * setter, GstTagMergeMode mode,
* The list must be terminated with NULL. * The list must be terminated with NULL.
*/ */
void void
gst_tag_setter_add_valist_values (GstTagSetter * setter, GstTagMergeMode mode, gst_tag_setter_add_tag_valist_values (GstTagSetter * setter,
const gchar * tag, va_list var_args) GstTagMergeMode mode, const gchar * tag, va_list var_args)
{ {
GstTagData *data; GstTagData *data;

48
gst/gsttagsetter.h
View file

@ -46,37 +46,37 @@ struct _GstTagSetterIFace
/* virtual table */ /* virtual table */
}; };
GType gst_tag_setter_get_type (void); GType gst_tag_setter_get_type (void);
void gst_tag_setter_merge (GstTagSetter * setter, void gst_tag_setter_merge_tags (GstTagSetter * setter,
const GstTagList * list, const GstTagList * list,
GstTagMergeMode mode); GstTagMergeMode mode);
void gst_tag_setter_add (GstTagSetter * setter, void gst_tag_setter_add_tags (GstTagSetter * setter,
GstTagMergeMode mode, GstTagMergeMode mode,
const gchar * tag, const gchar * tag,
...) G_GNUC_NULL_TERMINATED; ...) G_GNUC_NULL_TERMINATED;
void gst_tag_setter_add_values (GstTagSetter * setter, void gst_tag_setter_add_tag_values (GstTagSetter * setter,
GstTagMergeMode mode, GstTagMergeMode mode,
const gchar * tag, const gchar * tag,
...) G_GNUC_NULL_TERMINATED; ...) G_GNUC_NULL_TERMINATED;
void gst_tag_setter_add_valist (GstTagSetter * setter, void gst_tag_setter_add_tag_valist (GstTagSetter * setter,
GstTagMergeMode mode, GstTagMergeMode mode,
const gchar * tag, const gchar * tag,
va_list var_args); va_list var_args);
void gst_tag_setter_add_valist_values(GstTagSetter * setter, void gst_tag_setter_add_tag_valist_values(GstTagSetter * setter,
GstTagMergeMode mode, GstTagMergeMode mode,
const gchar * tag, const gchar * tag,
va_list var_args); va_list var_args);
G_CONST_RETURN GstTagList * G_CONST_RETURN GstTagList *
gst_tag_setter_get_list (GstTagSetter * setter); gst_tag_setter_get_tag_list (GstTagSetter * setter);
void gst_tag_setter_set_merge_mode (GstTagSetter * setter, void gst_tag_setter_set_tag_merge_mode (GstTagSetter * setter,
GstTagMergeMode mode); GstTagMergeMode mode);
GstTagMergeMode gst_tag_setter_get_merge_mode (GstTagSetter * setter); GstTagMergeMode gst_tag_setter_get_tag_merge_mode (GstTagSetter * setter);
G_END_DECLS G_END_DECLS