Commit 2fb27fa4 authored by Stefan Sauer's avatar Stefan Sauer
Browse files

xmptag: migrate to the _full version of the API and drop the _full postfix

Fix up all invocations.
parent b9054de1
...@@ -1643,7 +1643,6 @@ gst_tag_list_from_id3v2_tag ...@@ -1643,7 +1643,6 @@ gst_tag_list_from_id3v2_tag
<INCLUDE>gst/tag/tag.h</INCLUDE> <INCLUDE>gst/tag/tag.h</INCLUDE>
gst_tag_list_from_xmp_buffer gst_tag_list_from_xmp_buffer
gst_tag_list_to_xmp_buffer gst_tag_list_to_xmp_buffer
gst_tag_list_to_xmp_buffer_full
gst_tag_xmp_list_schemas gst_tag_xmp_list_schemas
<SUBSECTION Standard> <SUBSECTION Standard>
</SECTION> </SECTION>
......
...@@ -1666,7 +1666,7 @@ write_one_tag (const GstTagList * list, XmpTag * xmp_tag, gpointer user_data) ...@@ -1666,7 +1666,7 @@ write_one_tag (const GstTagList * list, XmpTag * xmp_tag, gpointer user_data)
} }
/** /**
* gst_tag_list_to_xmp_buffer_full: * gst_tag_list_to_xmp_buffer:
* @list: tags * @list: tags
* @read_only: does the container forbid inplace editing * @read_only: does the container forbid inplace editing
* @schemas: %NULL terminated array of schemas to be used on serialization * @schemas: %NULL terminated array of schemas to be used on serialization
...@@ -1678,7 +1678,7 @@ write_one_tag (const GstTagList * list, XmpTag * xmp_tag, gpointer user_data) ...@@ -1678,7 +1678,7 @@ write_one_tag (const GstTagList * list, XmpTag * xmp_tag, gpointer user_data)
* Returns: new buffer or %NULL, unref the buffer when done * Returns: new buffer or %NULL, unref the buffer when done
*/ */
GstBuffer * GstBuffer *
gst_tag_list_to_xmp_buffer_full (const GstTagList * list, gboolean read_only, gst_tag_list_to_xmp_buffer (const GstTagList * list, gboolean read_only,
const gchar ** schemas) const gchar ** schemas)
{ {
GstBuffer *buffer = NULL; GstBuffer *buffer = NULL;
...@@ -1763,20 +1763,5 @@ gst_tag_list_to_xmp_buffer_full (const GstTagList * list, gboolean read_only, ...@@ -1763,20 +1763,5 @@ gst_tag_list_to_xmp_buffer_full (const GstTagList * list, gboolean read_only,
return buffer; return buffer;
} }
/**
* gst_tag_list_to_xmp_buffer:
* @list: tags
* @read_only: does the container forbid inplace editing
*
* Formats a taglist as a xmp packet.
*
* Returns: new buffer or %NULL, unref the buffer when done
*/
GstBuffer *
gst_tag_list_to_xmp_buffer (const GstTagList * list, gboolean read_only)
{
return gst_tag_list_to_xmp_buffer_full (list, read_only, NULL);
}
#undef gst_xmp_schema_lookup #undef gst_xmp_schema_lookup
#undef gst_xmp_schema_insert #undef gst_xmp_schema_insert
...@@ -447,12 +447,11 @@ GstTagList * gst_tag_list_from_id3v2_tag (GstBuffer * buffer); ...@@ -447,12 +447,11 @@ GstTagList * gst_tag_list_from_id3v2_tag (GstBuffer * buffer);
guint gst_tag_get_id3v2_tag_size (GstBuffer * buffer); guint gst_tag_get_id3v2_tag_size (GstBuffer * buffer);
/* functions to convert GstBuffers with xmp packets contents to GstTagLists and back */ /* functions to convert GstBuffers with xmp packets contents to GstTagLists and back */
GstTagList * gst_tag_list_from_xmp_buffer (GstBuffer * buffer); GstTagList * gst_tag_list_from_xmp_buffer (GstBuffer * buffer);
GstBuffer * gst_tag_list_to_xmp_buffer (const GstTagList * list, GstBuffer * gst_tag_list_to_xmp_buffer (const GstTagList * list,
gboolean read_only); gboolean read_only,
GstBuffer * gst_tag_list_to_xmp_buffer_full (const GstTagList * list, const gchar ** schemas);
gboolean read_only, const gchar ** schemas); const gchar** gst_tag_xmp_list_schemas (void);
const gchar** gst_tag_xmp_list_schemas (void);
/* functions related to exif */ /* functions related to exif */
GstBuffer * gst_tag_list_to_exif_buffer (const GstTagList * taglist, GstBuffer * gst_tag_list_to_exif_buffer (const GstTagList * taglist,
......
...@@ -305,7 +305,7 @@ gst_tag_xmp_writer_tag_list_to_xmp_buffer (GstTagXmpWriter * config, ...@@ -305,7 +305,7 @@ gst_tag_xmp_writer_tag_list_to_xmp_buffer (GstTagXmpWriter * config,
for (iter = data->schemas; iter; iter = g_slist_next (iter)) { for (iter = data->schemas; iter; iter = g_slist_next (iter)) {
array[i++] = (gchar *) iter->data; array[i++] = (gchar *) iter->data;
} }
buf = gst_tag_list_to_xmp_buffer_full (taglist, read_only, buf = gst_tag_list_to_xmp_buffer (taglist, read_only,
(const gchar **) array); (const gchar **) array);
g_free (array); g_free (array);
} }
......
...@@ -962,7 +962,7 @@ GST_START_TEST (test_xmp_formatting) ...@@ -962,7 +962,7 @@ GST_START_TEST (test_xmp_formatting)
GST_TAG_DESCRIPTION, "test decription", GST_TAG_DESCRIPTION, "test decription",
GST_TAG_KEYWORDS, "keyword1", GST_TAG_KEYWORDS, "keyword2", NULL); GST_TAG_KEYWORDS, "keyword1", GST_TAG_KEYWORDS, "keyword2", NULL);
buf = gst_tag_list_to_xmp_buffer (list, FALSE); buf = gst_tag_list_to_xmp_buffer (list, FALSE, NULL);
fail_unless (buf != NULL); fail_unless (buf != NULL);
gst_buffer_map (buf, &map, GST_MAP_READ); gst_buffer_map (buf, &map, GST_MAP_READ);
...@@ -1075,7 +1075,7 @@ do_xmp_tag_serialization_deserialization (GstTagList * taglist, ...@@ -1075,7 +1075,7 @@ do_xmp_tag_serialization_deserialization (GstTagList * taglist,
GstTagList *taglist2; GstTagList *taglist2;
GstBuffer *buf; GstBuffer *buf;
buf = gst_tag_list_to_xmp_buffer_full (taglist, TRUE, schemas); buf = gst_tag_list_to_xmp_buffer (taglist, TRUE, schemas);
taglist2 = gst_tag_list_from_xmp_buffer (buf); taglist2 = gst_tag_list_from_xmp_buffer (buf);
fail_unless (gst_tag_list_is_equal (taglist, taglist2)); fail_unless (gst_tag_list_is_equal (taglist, taglist2));
......
...@@ -132,7 +132,7 @@ GST_START_TEST (test_default) ...@@ -132,7 +132,7 @@ GST_START_TEST (test_default)
buf = buf =
gst_tag_xmp_writer_tag_list_to_xmp_buffer (GST_TAG_XMP_WRITER gst_tag_xmp_writer_tag_list_to_xmp_buffer (GST_TAG_XMP_WRITER
(test_element), taglist, TRUE); (test_element), taglist, TRUE);
buf2 = gst_tag_list_to_xmp_buffer (taglist, TRUE); buf2 = gst_tag_list_to_xmp_buffer (taglist, TRUE, NULL);
fail_unless (gst_buffer_equals (buf, buf2)); fail_unless (gst_buffer_equals (buf, buf2));
gst_object_unref (test_element); gst_object_unref (test_element);
......
...@@ -36,7 +36,6 @@ EXPORTS ...@@ -36,7 +36,6 @@ EXPORTS
gst_tag_list_to_exif_buffer_with_tiff_header gst_tag_list_to_exif_buffer_with_tiff_header
gst_tag_list_to_vorbiscomment_buffer gst_tag_list_to_vorbiscomment_buffer
gst_tag_list_to_xmp_buffer gst_tag_list_to_xmp_buffer
gst_tag_list_to_xmp_buffer_full
gst_tag_mux_get_type gst_tag_mux_get_type
gst_tag_parse_extended_comment gst_tag_parse_extended_comment
gst_tag_register_musicbrainz_tags gst_tag_register_musicbrainz_tags
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment