From 5d2860b0504dbfa7d5bf40c6cdfb2735304a4ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Mon, 14 Aug 2006 19:04:56 +0000
Subject: [PATCH] API: add GST_TAG_EXTENDED_COMMENT (#350935).

Original commit message from CVS:
* docs/gst/gstreamer-sections.txt:
* gst/gsttaglist.c: (_gst_tag_initialize):
* gst/gsttaglist.h:
API: add GST_TAG_EXTENDED_COMMENT (#350935).
---
 ChangeLog                       |  7 +++++++
 docs/gst/gstreamer-sections.txt |  1 +
 gst/gsttaglist.c                |  7 ++++++-
 gst/gsttaglist.h                | 15 +++++++++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5b367bf2ad..d07b97b7f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-14  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* docs/gst/gstreamer-sections.txt:
+	* gst/gsttaglist.c: (_gst_tag_initialize):
+	* gst/gsttaglist.h:
+	  API: add GST_TAG_EXTENDED_COMMENT (#350935).
+
 2006-08-14  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/gstinfo.c: (gst_debug_print_object):
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index ff60a00e76..7cd2f04820 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -1774,6 +1774,7 @@ GST_TAG_ALBUM
 GST_TAG_DATE
 GST_TAG_GENRE
 GST_TAG_COMMENT
+GST_TAG_EXTENDED_COMMENT
 GST_TAG_TRACK_NUMBER
 GST_TAG_TRACK_COUNT
 GST_TAG_ALBUM_VOLUME_NUMBER
diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c
index bcd931366b..47b20f4bbb 100644
--- a/gst/gsttaglist.c
+++ b/gst/gsttaglist.c
@@ -113,7 +113,12 @@ _gst_tag_initialize (void)
   gst_tag_register (GST_TAG_COMMENT, GST_TAG_FLAG_META,
       G_TYPE_STRING,
       _("comment"),
-      _("free text commenting the data"), gst_tag_merge_strings_with_comma);
+      _("free text commenting the data"), gst_tag_merge_use_first);
+  gst_tag_register (GST_TAG_EXTENDED_COMMENT, GST_TAG_FLAG_META,
+      G_TYPE_STRING,
+      _("extended comment"),
+      _("free text commenting the data in key=value or key[en]=comment form"),
+      gst_tag_merge_use_first);
   gst_tag_register (GST_TAG_TRACK_NUMBER, GST_TAG_FLAG_META,
       G_TYPE_UINT,
       _("track number"),
diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h
index 44a6afd3be..a3b3d0d5fb 100644
--- a/gst/gsttaglist.h
+++ b/gst/gsttaglist.h
@@ -314,6 +314,21 @@ gboolean        gst_tag_list_get_date_index     (const GstTagList     * list,
  * free text commenting the data (string)
  */
 #define GST_TAG_COMMENT			"comment"
+/**
+ * GST_TAG_EXTENDED_COMMENT:
+ *
+ * key/value text commenting the data (string)
+ *
+ * Must be in the form of 'key=comment' or
+ * 'key[lc]=comment' where 'lc' is an ISO-639
+ * language code.
+ *
+ * This tag is used for unknown Vorbis comment tags,
+ * unknown APE tags and certain ID3v2 comment fields.
+ *
+ * Since: 0.10.10
+ */
+#define GST_TAG_EXTENDED_COMMENT	"extended-comment"
 /**
  * GST_TAG_TRACK_NUMBER:
  *