Index: gst/gsttagsetter.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gsttagsetter.c,v
retrieving revision 1.14
diff -u -d -p -r1.14 gsttagsetter.c
--- gst/gsttagsetter.c	15 Oct 2005 16:01:57 -0000	1.14
+++ gst/gsttagsetter.c	21 Nov 2005 20:17:24 -0000
@@ -107,7 +107,7 @@ gst_tag_setter_get_data (GstTagSetter * 
 }
 
 /**
- * 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
@@ -115,7 +115,7 @@ gst_tag_setter_get_data (GstTagSetter * 
  * 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;
@@ -132,7 +132,7 @@ gst_tag_setter_merge (GstTagSetter * set
 }
 
 /**
- * gst_tag_setter_add:
+ * gst_tag_setter_add_tags:
  * @setter: a #GstTagSetter
  * @mode: the mode to use
  * @tag: tag to set
@@ -142,7 +142,7 @@ gst_tag_setter_merge (GstTagSetter * 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;
@@ -151,12 +151,12 @@ gst_tag_setter_add (GstTagSetter * sette
   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
@@ -166,7 +166,7 @@ gst_tag_setter_add (GstTagSetter * sette
  * 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;
@@ -175,12 +175,12 @@ gst_tag_setter_add_values (GstTagSetter 
   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
@@ -190,7 +190,7 @@ gst_tag_setter_add_values (GstTagSetter 
  * 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;
@@ -206,7 +206,7 @@ gst_tag_setter_add_valist (GstTagSetter 
 }
 
 /**
- * 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
@@ -216,7 +216,7 @@ gst_tag_setter_add_valist (GstTagSetter 
  * The list must be terminated with NULL.
  */
 void
-gst_tag_setter_add_valist_values (GstTagSetter * setter, GstTagMergeMode mode,
+gst_tag_setter_add_tag_valist_values (GstTagSetter * setter, GstTagMergeMode mode,
     const gchar * tag, va_list var_args)
 {
   GstTagData *data;
Index: gst/gsttagsetter.h
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gsttagsetter.h,v
retrieving revision 1.10
diff -u -d -p -r1.10 gsttagsetter.h
--- gst/gsttagsetter.h	21 Nov 2005 18:41:39 -0000	1.10
+++ gst/gsttagsetter.h	21 Nov 2005 20:17:24 -0000
@@ -46,37 +46,37 @@ struct _GstTagSetterIFace
   /* virtual table */
 };
 
-GType		gst_tag_setter_get_type		(void);
+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_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_values	(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_valist     	(GstTagSetter *		setter,
-						 GstTagMergeMode	mode,
-						 const gchar *		tag,
-						 va_list		var_args);
+void            gst_tag_setter_add_tag_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);
+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
 
