From 2fb27fa463fb9e54a38ecfc15729b81cdc931595 Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Wed, 12 Sep 2012 21:32:04 +0200 Subject: [PATCH] xmptag: migrate to the _full version of the API and drop the _full postfix Fix up all invocations. --- docs/libs/gst-plugins-base-libs-sections.txt | 1 - gst-libs/gst/tag/gstxmptag.c | 19 ++----------------- gst-libs/gst/tag/tag.h | 11 +++++------ gst-libs/gst/tag/xmpwriter.c | 2 +- tests/check/libs/tag.c | 4 ++-- tests/check/libs/xmpwriter.c | 2 +- win32/common/libgsttag.def | 1 - 7 files changed, 11 insertions(+), 29 deletions(-) diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt index 0b08fd8..68e2b80 100644 --- a/docs/libs/gst-plugins-base-libs-sections.txt +++ b/docs/libs/gst-plugins-base-libs-sections.txt @@ -1643,7 +1643,6 @@ gst_tag_list_from_id3v2_tag gst/tag/tag.h gst_tag_list_from_xmp_buffer gst_tag_list_to_xmp_buffer -gst_tag_list_to_xmp_buffer_full gst_tag_xmp_list_schemas diff --git a/gst-libs/gst/tag/gstxmptag.c b/gst-libs/gst/tag/gstxmptag.c index 8250f7c..597579b 100644 --- a/gst-libs/gst/tag/gstxmptag.c +++ b/gst-libs/gst/tag/gstxmptag.c @@ -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 * @read_only: does the container forbid inplace editing * @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) * Returns: new buffer or %NULL, unref the buffer when done */ 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) { GstBuffer *buffer = NULL; @@ -1763,20 +1763,5 @@ gst_tag_list_to_xmp_buffer_full (const GstTagList * list, gboolean read_only, 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_insert diff --git a/gst-libs/gst/tag/tag.h b/gst-libs/gst/tag/tag.h index 146aae9..b75ad6e 100644 --- a/gst-libs/gst/tag/tag.h +++ b/gst-libs/gst/tag/tag.h @@ -447,12 +447,11 @@ 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 (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, - gboolean read_only, const gchar ** schemas); -const gchar** gst_tag_xmp_list_schemas (void); +GstTagList * gst_tag_list_from_xmp_buffer (GstBuffer * buffer); +GstBuffer * gst_tag_list_to_xmp_buffer (const GstTagList * list, + gboolean read_only, + const gchar ** schemas); +const gchar** gst_tag_xmp_list_schemas (void); /* functions related to exif */ GstBuffer * gst_tag_list_to_exif_buffer (const GstTagList * taglist, diff --git a/gst-libs/gst/tag/xmpwriter.c b/gst-libs/gst/tag/xmpwriter.c index 95660bc..3a38f29 100644 --- a/gst-libs/gst/tag/xmpwriter.c +++ b/gst-libs/gst/tag/xmpwriter.c @@ -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)) { 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); g_free (array); } diff --git a/tests/check/libs/tag.c b/tests/check/libs/tag.c index 09b5197..edd6edf 100644 --- a/tests/check/libs/tag.c +++ b/tests/check/libs/tag.c @@ -962,7 +962,7 @@ GST_START_TEST (test_xmp_formatting) GST_TAG_DESCRIPTION, "test decription", 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); gst_buffer_map (buf, &map, GST_MAP_READ); @@ -1075,7 +1075,7 @@ do_xmp_tag_serialization_deserialization (GstTagList * taglist, GstTagList *taglist2; 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); fail_unless (gst_tag_list_is_equal (taglist, taglist2)); diff --git a/tests/check/libs/xmpwriter.c b/tests/check/libs/xmpwriter.c index ba0e642..402d08f 100644 --- a/tests/check/libs/xmpwriter.c +++ b/tests/check/libs/xmpwriter.c @@ -132,7 +132,7 @@ GST_START_TEST (test_default) buf = gst_tag_xmp_writer_tag_list_to_xmp_buffer (GST_TAG_XMP_WRITER (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)); gst_object_unref (test_element); diff --git a/win32/common/libgsttag.def b/win32/common/libgsttag.def index 76db224..c8d4623 100644 --- a/win32/common/libgsttag.def +++ b/win32/common/libgsttag.def @@ -36,7 +36,6 @@ EXPORTS gst_tag_list_to_exif_buffer_with_tiff_header gst_tag_list_to_vorbiscomment_buffer gst_tag_list_to_xmp_buffer - gst_tag_list_to_xmp_buffer_full gst_tag_mux_get_type gst_tag_parse_extended_comment gst_tag_register_musicbrainz_tags -- 2.7.4