Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst-libs / gst / tag / tag.h

diff --git a/gst-libs/gst/tag/tag.h b/gst-libs/gst/tag/tag.h
index 074f81e..3e203f7 100644 (file)
--- a/gst-libs/gst/tag/tag.h
+++ b/gst-libs/gst/tag/tag.h
@@ -59,18 +59,6 @@ G_BEGIN_DECLS
  */
 #define GST_TAG_MUSICBRAINZ_TRMID      "musicbrainz-trmid"
 
-/* FIXME 0.11: remove GST_TAG_MUSICBRAINZ_SORTNAME */
-#ifndef GST_DISABLE_DEPRECATED
-/**
- * GST_TAG_MUSICBRAINZ_SORTNAME
- *
- * MusicBrainz artist sort name
- *
- * Deprecated.  Use GST_TAG_ARTIST_SORTNAME instead.
- */
-#define GST_TAG_MUSICBRAINZ_SORTNAME   GST_TAG_ARTIST_SORTNAME
-#endif
-
 /**
  * GST_TAG_CMML_STREAM
  *
@@ -388,7 +376,7 @@ G_BEGIN_DECLS
 /**
  * GstTagImageType:
  * @GST_TAG_IMAGE_TYPE_NONE                  : No image type. Can be used to
- *      tell functions such as gst_tag_image_data_to_image_buffer() that no
+ *      tell functions such as gst_tag_image_data_to_image_sample() that no
  *      image type should be set. (Since: 0.10.20)
  * @GST_TAG_IMAGE_TYPE_UNDEFINED             : Undefined/other image type
  * @GST_TAG_IMAGE_TYPE_FRONT_COVER           : Cover (front)
@@ -464,7 +452,12 @@ GList *                 gst_tag_to_vorbis_comments              (const GstTagLis
                                                                  const gchar *          tag);
 
 /* functions to convert GstBuffers with vorbiscomment contents to GstTagLists and back */
-GstTagList *            gst_tag_list_from_vorbiscomment_buffer  (const GstBuffer *      buffer,
+GstTagList *            gst_tag_list_from_vorbiscomment         (const guint8 *         data,
+                                                                 gsize                  size,
+                                                                 const guint8 *         id_data,
+                                                                 const guint            id_data_length,
+                                                                 gchar **               vendor_string);
+GstTagList *            gst_tag_list_from_vorbiscomment_buffer  (GstBuffer *            buffer,
                                                                  const guint8 *         id_data,
                                                                  const guint            id_data_length,
                                                                  gchar **               vendor_string);
@@ -498,7 +491,7 @@ GstTagList *            gst_tag_list_from_id3v2_tag (GstBuffer * buffer);
 guint                   gst_tag_get_id3v2_tag_size  (GstBuffer * buffer);
 
 /* functions to  convert GstBuffers with xmp packets contents to GstTagLists and back */
-GstTagList *            gst_tag_list_from_xmp_buffer  (const GstBuffer *  buffer);
+GstTagList *            gst_tag_list_from_xmp_buffer  (GstBuffer *  buffer);
 GstBuffer *             gst_tag_list_to_xmp_buffer    (const GstTagList * list,
                                                        gboolean           read_only);
 GstBuffer *            gst_tag_list_to_xmp_buffer_full (const GstTagList * list,
@@ -512,12 +505,12 @@ GstBuffer *             gst_tag_list_to_exif_buffer (const GstTagList * taglist,
 
 GstBuffer *             gst_tag_list_to_exif_buffer_with_tiff_header (const GstTagList * taglist);
 
-GstTagList *            gst_tag_list_from_exif_buffer (const GstBuffer * buffer,
+GstTagList *            gst_tag_list_from_exif_buffer (GstBuffer * buffer,
                                                        gint byte_order,
                                                        guint32 base_offset);
 
 GstTagList *            gst_tag_list_from_exif_buffer_with_tiff_header (
-                                                      const GstBuffer * buffer);
+                                                      GstBuffer * buffer);
 
 /* other tag-related functions */
 
@@ -531,7 +524,7 @@ gchar                 * gst_tag_freeform_string_to_utf8 (const gchar  * data,
                                                          gint           size,
                                                          const gchar ** env_vars);
 
-GstBuffer             * gst_tag_image_data_to_image_buffer (const guint8   * image_data,
+GstSample             * gst_tag_image_data_to_image_sample (const guint8   * image_data,
                                                             guint            image_data_len,
                                                             GstTagImageType  image_type);