+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>
* check/gst/gstcaps.c: (GST_START_TEST):
}
/**
- * gst_tag_setter_merge:
+ * gst_tag_setter_merge_tags:
* @setter: a #GstTagSetter
* @list: a tag list to merge from
* @mode: the mode to merge with
* Merges the given list into the setter's list using the given mode.
*/
void
-gst_tag_setter_merge (GstTagSetter * setter, const GstTagList * list,
+gst_tag_setter_merge_tags (GstTagSetter * setter, const GstTagList * list,
GstTagMergeMode mode)
{
GstTagData *data;
}
/**
- * gst_tag_setter_add:
+ * gst_tag_setter_add_tags:
* @setter: a #GstTagSetter
* @mode: the mode to use
* @tag: tag to set
* The list must be terminated with NULL.
*/
void
-gst_tag_setter_add (GstTagSetter * setter, GstTagMergeMode mode,
+gst_tag_setter_add_tags (GstTagSetter * setter, GstTagMergeMode mode,
const gchar * tag, ...)
{
va_list args;
g_return_if_fail (GST_TAG_MODE_IS_VALID (mode));
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);
}
/**
- * gst_tag_setter_add_values:
+ * gst_tag_setter_add_tag_values:
* @setter: a #GstTagSetter
* @mode: the mode to use
* @tag: tag to set
* The list must be terminated with NULL.
*/
void
-gst_tag_setter_add_values (GstTagSetter * setter, GstTagMergeMode mode,
+gst_tag_setter_add_tag_values (GstTagSetter * setter, GstTagMergeMode mode,
const gchar * tag, ...)
{
va_list args;
g_return_if_fail (GST_TAG_MODE_IS_VALID (mode));
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);
}
/**
- * gst_tag_setter_add_valist:
+ * gst_tag_setter_tag_add_valist:
* @setter: a #GstTagSetter
* @mode: the mode to use
* @tag: tag to set
* The list must be terminated with NULL.
*/
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)
{
GstTagData *data;
}
/**
- * gst_tag_setter_add_valist_values:
+ * gst_tag_setter_add_tag_valist_values:
* @setter: a #GstTagSetter
* @mode: the mode to use
* @tag: tag to set
* The list must be terminated with NULL.
*/
void
-gst_tag_setter_add_valist_values (GstTagSetter * setter, GstTagMergeMode mode,
- const gchar * tag, va_list var_args)
+gst_tag_setter_add_tag_valist_values (GstTagSetter * setter,
+ GstTagMergeMode mode, const gchar * tag, va_list var_args)
{
GstTagData *data;
/* virtual table */
};
-GType gst_tag_setter_get_type (void);
-
-void gst_tag_setter_merge (GstTagSetter * setter,
- const GstTagList * list,
- GstTagMergeMode mode);
-void gst_tag_setter_add (GstTagSetter * setter,
- GstTagMergeMode mode,
- const gchar * tag,
- ...) G_GNUC_NULL_TERMINATED;
-
-void gst_tag_setter_add_values (GstTagSetter * setter,
- GstTagMergeMode mode,
- const gchar * tag,
- ...) G_GNUC_NULL_TERMINATED;
-
-void gst_tag_setter_add_valist (GstTagSetter * setter,
- GstTagMergeMode mode,
- const gchar * tag,
- va_list var_args);
-
-void gst_tag_setter_add_valist_values(GstTagSetter * setter,
- GstTagMergeMode mode,
- const gchar * tag,
- va_list var_args);
+GType gst_tag_setter_get_type (void);
+
+void gst_tag_setter_merge_tags (GstTagSetter * setter,
+ const GstTagList * list,
+ GstTagMergeMode mode);
+void gst_tag_setter_add_tags (GstTagSetter * setter,
+ GstTagMergeMode mode,
+ const gchar * tag,
+ ...) G_GNUC_NULL_TERMINATED;
+
+void gst_tag_setter_add_tag_values (GstTagSetter * setter,
+ GstTagMergeMode mode,
+ const gchar * tag,
+ ...) G_GNUC_NULL_TERMINATED;
+
+void gst_tag_setter_add_tag_valist (GstTagSetter * setter,
+ GstTagMergeMode mode,
+ const gchar * tag,
+ va_list var_args);
+
+void gst_tag_setter_add_tag_valist_values(GstTagSetter * setter,
+ GstTagMergeMode mode,
+ const gchar * tag,
+ va_list var_args);
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,
- GstTagMergeMode mode);
-GstTagMergeMode gst_tag_setter_get_merge_mode (GstTagSetter * setter);
+void gst_tag_setter_set_tag_merge_mode (GstTagSetter * setter,
+ GstTagMergeMode mode);
+GstTagMergeMode gst_tag_setter_get_tag_merge_mode (GstTagSetter * setter);
G_END_DECLS