Commit 698e4050 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller

gst-libs/gst/tag/: Deprecate GST_TAG_MUSICBRAINZ_SORTNAME, replaced by the newly-added

Original commit message from CVS:
* gst-libs/gst/tag/tag.h: (GST_TAG_MUSICBRAINZ_SORTNAME):
* gst-libs/gst/tag/tags.c:
Deprecate GST_TAG_MUSICBRAINZ_SORTNAME, replaced by the newly-added
GST_TAG_ARTIST_SORTNAME (in an API and ABI compatible way).
* gst-libs/gst/tag/gstid3tag.c: (tag_matches):
Map ID3v2 TSOP, TSOA and TSOT frames to new SORTNAME tags (#414539).
* gst-libs/gst/tag/gstvorbistag.c: (tag_matches),
(gst_tag_to_vorbis_comments):
Map new SORTNAME tags (these tags aren't even semi-official, so I'm
just mapping everything I found in the wild) (#414539).
parent 77cef568
2007-10-25 Tim-Philipp Müller <tim at centricular dot net>
* gst-libs/gst/tag/tag.h: (GST_TAG_MUSICBRAINZ_SORTNAME):
* gst-libs/gst/tag/tags.c:
Deprecate GST_TAG_MUSICBRAINZ_SORTNAME, replaced by the newly-added
GST_TAG_ARTIST_SORTNAME (in an API and ABI compatible way).
* gst-libs/gst/tag/gstid3tag.c: (tag_matches):
Map ID3v2 TSOP, TSOA and TSOT frames to new SORTNAME tags (#414539).
* gst-libs/gst/tag/gstvorbistag.c: (tag_matches),
(gst_tag_to_vorbis_comments):
Map new SORTNAME tags (these tags aren't even semi-official, so I'm
just mapping everything I found in the wild) (#414539).
2007-10-24 Wim Taymans <wim.taymans@gmail.com>
Inspired by patch of: René Stadler <mail at renestadler dot de>
......@@ -209,7 +209,9 @@ static const GstTagEntryMatch tag_matches[] = {
{GST_TAG_IMAGE, "APIC"},
{GST_TAG_ENCODER, "TSSE"},
{GST_TAG_BEATS_PER_MINUTE, "TBPM"},
{GST_TAG_MUSICBRAINZ_SORTNAME, "TSOP"},
{GST_TAG_ARTIST_SORTNAME, "TSOP"},
{GST_TAG_ALBUM_SORTNAME, "TSOA"},
{GST_TAG_TITLE_SORTNAME, "TSOT"},
{NULL, NULL}
};
......
......@@ -76,7 +76,13 @@ static const GstTagEntryMatch tag_matches[] = {
{GST_TAG_MUSICBRAINZ_ALBUMID, "MUSICBRAINZ_ALBUMID"},
{GST_TAG_MUSICBRAINZ_ALBUMARTISTID, "MUSICBRAINZ_ALBUMARTISTID"},
{GST_TAG_MUSICBRAINZ_TRMID, "MUSICBRAINZ_TRMID"},
{GST_TAG_MUSICBRAINZ_SORTNAME, "MUSICBRAINZ_SORTNAME"},
{GST_TAG_ARTIST_SORTNAME, "ARTISTSORT"},
{GST_TAG_ARTIST_SORTNAME, "ARTISTSORTORDER"},
{GST_TAG_ARTIST_SORTNAME, "MUSICBRAINZ_SORTNAME"},
{GST_TAG_ALBUM_SORTNAME, "ALBUMSORT"},
{GST_TAG_ALBUM_SORTNAME, "ALBUMSORTORDER"},
{GST_TAG_TITLE_SORTNAME, "TITLESORT"},
{GST_TAG_TITLE_SORTNAME, "TITLESORTORDER"},
{GST_TAG_LANGUAGE_CODE, "LANGUAGE"},
{GST_TAG_CDDA_MUSICBRAINZ_DISCID, "MUSICBRAINZ_DISCID"},
{GST_TAG_CDDA_CDDB_DISCID, "DISCID"},
......@@ -408,6 +414,8 @@ gst_tag_to_vorbis_comments (const GstTagList * list, const gchar * tag)
return NULL;
}
/* FIXME: for tags that can map to multiple vorbis comment keys, add all
* of the possible keys */
for (i = 0; i < gst_tag_list_get_tag_size (list, tag); i++) {
GType tag_type = gst_tag_get_type (tag);
gchar *result = NULL;
......
......@@ -57,12 +57,19 @@ G_BEGIN_DECLS
* MusicBrainz track TRM ID
*/
#define GST_TAG_MUSICBRAINZ_TRMID "musicbrainz-trmid"
/* FIXME 0.11: remove GST_TAG_MUSICBRAINZ_SORTNAME */
#ifndef GST_DISABLE_DEPRECATED
/**
* GST_TAG_MUSICBRAINZ_SORTNAME
*
* MusicBrainz artist sort name
*
* Deprecated. Use GST_TAG_ARTIST_SORTNAME instead.
*/
#define GST_TAG_MUSICBRAINZ_SORTNAME "musicbrainz-sortname"
#define GST_TAG_MUSICBRAINZ_SORTNAME GST_TAG_ARTIST_SORTNAME
#endif
/**
* GST_TAG_CMML_STREAM
*
......
......@@ -64,9 +64,6 @@ gst_tag_register_tags_internal (gpointer unused)
_("album artist ID"), _("MusicBrainz album artist ID"), NULL);
gst_tag_register (GST_TAG_MUSICBRAINZ_TRMID, GST_TAG_FLAG_META,
G_TYPE_STRING, _("track TRM ID"), _("MusicBrainz TRM ID"), NULL);
gst_tag_register (GST_TAG_MUSICBRAINZ_SORTNAME, GST_TAG_FLAG_META,
G_TYPE_STRING,
_("artist sortname"), _("MusicBrainz artist sortname"), NULL);
/* CDDA tags */
gst_tag_register (GST_TAG_CDDA_CDDB_DISCID, GST_TAG_FLAG_META,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment