Map ID3v2 WCOP frame to GST_TAG_COPYRIGHT_URI (#447000).

Original commit message from CVS:
Patch by: Jason Kivlighn  <jkivlighn gmail com>
* gst-libs/gst/tag/gstid3tag.c:
* tests/check/libs/tag.c:
Map ID3v2 WCOP frame to GST_TAG_COPYRIGHT_URI (#447000).

diff --git a/ChangeLog b/ChangeLog
index fec8009..cd832d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-11  Tim-Philipp Müller  <tim at centricular dot net>
+
+       Patch by: Jason Kivlighn  <jkivlighn gmail com>
+
+       * gst-libs/gst/tag/gstid3tag.c:
+       * tests/check/libs/tag.c:
+         Map ID3v2 WCOP frame to GST_TAG_COPYRIGHT_URI (#447000).
+
 2007-10-10  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst-libs/gst/tag/gsttagdemux.c:

diff --git a/gst-libs/gst/tag/gstid3tag.c b/gst-libs/gst/tag/gstid3tag.c
index e26a58f..5d17d3d 100644 (file)
--- a/gst-libs/gst/tag/gstid3tag.c
+++ b/gst-libs/gst/tag/gstid3tag.c
@@ -199,6 +199,7 @@ static const GstTagEntryMatch tag_matches[] = {
   {GST_TAG_ARTIST, "TPE1"},
   {GST_TAG_COMPOSER, "TCOM"},
   {GST_TAG_COPYRIGHT, "TCOP"},
+  {GST_TAG_COPYRIGHT_URI, "WCOP"},
   {GST_TAG_GENRE, "TCON"},
   {GST_TAG_DATE, "TDRC"},
   {GST_TAG_COMMENT, "COMM"},

diff --git a/tests/check/libs/tag.c b/tests/check/libs/tag.c
index 1cfd422..148edb6 100644 (file)
--- a/tests/check/libs/tag.c
+++ b/tests/check/libs/tag.c
@@ -582,6 +582,8 @@ GST_START_TEST (test_id3_tags)
   fail_unless (gst_tag_from_id3_tag ("TALB") != NULL);
   ASSERT_CRITICAL (gst_tag_from_id3_tag (NULL));
   fail_unless (gst_tag_from_id3_tag ("R2D2") == NULL);
+  fail_unless_equals_string (gst_tag_from_id3_tag ("WCOP"),
+      GST_TAG_COPYRIGHT_URI);
 
   /* gst_tag_from_id3_user_tag */
   ASSERT_CRITICAL (gst_tag_from_id3_user_tag (NULL, "foo"));
@@ -592,7 +594,8 @@ GST_START_TEST (test_id3_tags)
   ASSERT_CRITICAL (gst_tag_to_id3_tag (NULL));
   fail_unless (gst_tag_to_id3_tag ("R2D2") == NULL);
   fail_unless (gst_tag_to_id3_tag (GST_TAG_ARTIST) != NULL);
-
+  fail_unless_equals_string (gst_tag_to_id3_tag (GST_TAG_COPYRIGHT_URI),
+      "WCOP");
 
   fail_unless (GST_TYPE_TAG_IMAGE_TYPE != 0);
   fail_unless (g_type_name (GST_TYPE_TAG_IMAGE_TYPE) != NULL);