Merge remote-tracking branch 'origin/0.10'

[platform/upstream/gstreamer.git] / gst / gsttagsetter.h

diff --git a/gst/gsttagsetter.h b/gst/gsttagsetter.h
index f7941c1..580053c 100644 (file)
--- a/gst/gsttagsetter.h
+++ b/gst/gsttagsetter.h
@@ -26,28 +26,28 @@
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_TAG_SETTER            (gst_tag_setter_get_type ())
-#define GST_TAG_SETTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TAG_SETTER, GstTagSetter))
-#define GST_IS_TAG_SETTER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TAG_SETTER))
-#define GST_TAG_SETTER_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_TAG_SETTER, GstTagSetterIFace))
+#define GST_TYPE_TAG_SETTER             (gst_tag_setter_get_type ())
+#define GST_TAG_SETTER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TAG_SETTER, GstTagSetter))
+#define GST_IS_TAG_SETTER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TAG_SETTER))
+#define GST_TAG_SETTER_GET_INTERFACE(obj)       (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GST_TYPE_TAG_SETTER, GstTagSetterInterface))
 
 /**
  * GstTagSetter:
  *
  * Opaque #GstTagSetter data structure.
  */
-typedef struct _GstTagSetter                   GstTagSetter; /* Dummy typedef */
-typedef struct _GstTagSetterIFace              GstTagSetterIFace;
+typedef struct _GstTagSetter                    GstTagSetter; /* Dummy typedef */
+typedef struct _GstTagSetterInterface           GstTagSetterInterface;
 
 /**
- * GstTagSetterIFace:
+ * GstTagSetterInterface:
  * @g_iface: parent interface type.
  *
- * #GstTagSetterIFace interface.
+ * #GstTagSetterInterface interface.
  */
 /* use an empty interface here to allow detection of elements using user-set
    tags */
-struct _GstTagSetterIFace
+struct _GstTagSetterInterface
 {
   GTypeInterface g_iface;
 
@@ -56,37 +56,44 @@ struct _GstTagSetterIFace
   /* virtual table */
 };
 
-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_tag_list          (GstTagSetter *    setter);
-
-void           gst_tag_setter_set_tag_merge_mode    (GstTagSetter *    setter,
-                                                     GstTagMergeMode   mode);
-GstTagMergeMode        gst_tag_setter_get_tag_merge_mode    (GstTagSetter *    setter);
+GType           gst_tag_setter_get_type             (void);
+
+void            gst_tag_setter_reset_tags             (GstTagSetter * setter);
+
+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);
+
+void            gst_tag_setter_add_tag_value        (GstTagSetter *     setter,
+                                                     GstTagMergeMode    mode,
+                                                     const gchar *      tag,
+                                                     const GValue *     value);
+
+const GstTagList *
+                gst_tag_setter_get_tag_list          (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