From 148b83dd20028f4b437114bf5da5b7454b312d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 7 Feb 2006 17:44:53 +0000 Subject: [PATCH] gst-libs/gst/tag/gstvorbistag.c: Make sure we called gst_tag_register_musicbrainz_tags() before possibly mapping a vo... Original commit message from CVS: * gst-libs/gst/tag/gstvorbistag.c: (gst_tag_from_vorbis_tag), (gst_tag_to_vorbis_tag): Make sure we called gst_tag_register_musicbrainz_tags() before possibly mapping a vorbiscomment string from/to a musicbrainz tag. --- ChangeLog | 8 ++++++++ gst-libs/gst/tag/gstvorbistag.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index ef9b25040e..e0cb4f96d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-02-07 Tim-Philipp Müller + + * gst-libs/gst/tag/gstvorbistag.c: (gst_tag_from_vorbis_tag), + (gst_tag_to_vorbis_tag): + Make sure we called gst_tag_register_musicbrainz_tags() + before possibly mapping a vorbiscomment string from/to a + musicbrainz tag. + 2006-02-07 Tim-Philipp Müller * gst/typefind/gsttypefindfunctions.c: (mp3_type_find): diff --git a/gst-libs/gst/tag/gstvorbistag.c b/gst-libs/gst/tag/gstvorbistag.c index d4847e2141..e6b7e284e2 100644 --- a/gst-libs/gst/tag/gstvorbistag.c +++ b/gst-libs/gst/tag/gstvorbistag.c @@ -90,6 +90,8 @@ gst_tag_from_vorbis_tag (const gchar * vorbis_tag) g_return_val_if_fail (vorbis_tag != NULL, NULL); + gst_tag_register_musicbrainz_tags (); + real_vorbis_tag = g_ascii_strup (vorbis_tag, -1); while (tag_matches[i].gstreamer_tag != NULL) { if (strcmp (real_vorbis_tag, tag_matches[i].original_tag) == 0) { @@ -116,6 +118,8 @@ gst_tag_to_vorbis_tag (const gchar * gst_tag) g_return_val_if_fail (gst_tag != NULL, NULL); + gst_tag_register_musicbrainz_tags (); + while (tag_matches[i].gstreamer_tag != NULL) { if (strcmp (gst_tag, tag_matches[i].gstreamer_tag) == 0) { return tag_matches[i].original_tag;