ext/taglib/gstid3v2mux.cc: Write GST_TAG_MUSICBRAINZ_DISCID and GST_TAG_CDDA_CDDB_DIS...

Original commit message from CVS:
* ext/taglib/gstid3v2mux.cc: (add_musicbrainz_tag), (add_funcs):
Write GST_TAG_MUSICBRAINZ_DISCID and GST_TAG_CDDA_CDDB_DISCID
into ID3v2 TXXX frames (fixes #347848).

diff --git a/ChangeLog b/ChangeLog
index 49a86a4400224f71b444f7164055ff03055413fb..7ff000456f2669de97f78da572ce054a23e65812 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-14  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * ext/taglib/gstid3v2mux.cc: (add_musicbrainz_tag), (add_funcs):
+         Write GST_TAG_MUSICBRAINZ_DISCID and GST_TAG_CDDA_CDDB_DISCID
+         into ID3v2 TXXX frames (fixes #347848).
+
 2007-11-14  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_open):

diff --git a/ext/taglib/gstid3v2mux.cc b/ext/taglib/gstid3v2mux.cc
index c799feb992bdb977793e20cf885a1da7ba2f4536..cf1762797b9696467051d65cb822b2e829a6a250 100644 (file)
--- a/ext/taglib/gstid3v2mux.cc
+++ b/ext/taglib/gstid3v2mux.cc
@@ -321,7 +321,14 @@ add_musicbrainz_tag (ID3v2::Tag * id3v2tag, const GstTagList * list,
     GST_TAG_MUSICBRAINZ_ALBUMID, "MusicBrainz Album Id", "musicbrainz_albumid"}, {
     GST_TAG_MUSICBRAINZ_ALBUMARTISTID, "MusicBrainz Album Artist Id",
           "musicbrainz_albumartistid"}, {
-    GST_TAG_MUSICBRAINZ_TRMID, "MusicBrainz TRM Id", "musicbrainz_trmid"}
+    GST_TAG_MUSICBRAINZ_TRMID, "MusicBrainz TRM Id", "musicbrainz_trmid"}, {
+    GST_TAG_CDDA_MUSICBRAINZ_DISCID, "MusicBrainz DiscID",
+          "musicbrainz_discid"}, {
+      /* the following one is more or less made up, there seems to be little
+       * evidence that any popular application is actually putting this info
+       * into TXXX frames; the first one comes from a musicbrainz wiki 'proposed
+       * tags' page, the second one is analogue to the vorbis/ape/flac tag. */
+    GST_TAG_CDDA_CDDB_DISCID, "CDDB DiscID", "discid"}
   };
   guint i, idx;
 
@@ -584,6 +591,8 @@ static const struct
   GST_TAG_MUSICBRAINZ_ALBUMID, add_musicbrainz_tag, "\001"}, {
   GST_TAG_MUSICBRAINZ_ALBUMARTISTID, add_musicbrainz_tag, "\002"}, {
   GST_TAG_MUSICBRAINZ_TRMID, add_musicbrainz_tag, "\003"}, {
+  GST_TAG_CDDA_MUSICBRAINZ_DISCID, add_musicbrainz_tag, "\004"}, {
+  GST_TAG_CDDA_CDDB_DISCID, add_musicbrainz_tag, "\005"}, {
   GST_TAG_MUSICBRAINZ_TRACKID, add_unique_file_id_tag, ""}, {
   GST_TAG_ARTIST_SORTNAME, add_text_tag, "TSOP"}, {
   GST_TAG_ALBUM_SORTNAME, add_text_tag, "TSOA"}, {