From adb2f66cedcac56eaaaa36e8026b497c96c522e6 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 7 Jul 2009 08:00:21 +0200 Subject: [PATCH] tag_id3: revised "performer" tag support According to the ID3 2.4 documentation, "TOPE" is "Original artist/performer", not "performer". Removed "TOPE" support. Instead, map TPE3 ("Conductor/performer refinement") and TPE4 ("Interpreted, remixed, or otherwise modified by") to "performer". --- NEWS | 1 + src/tag_id3.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index b8d2e97e4..047fa10b9 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ ver 0.16 (20??/??/??) - removed the deprecated "volume" command * tags: - added tag "AlbumArtistSort" + - id3: revised "performer" tag support * decoders: - ffmpeg: support multiple tags * mixers: diff --git a/src/tag_id3.c b/src/tag_id3.c index 019ad7ada..8f48e980b 100644 --- a/src/tag_id3.c +++ b/src/tag_id3.c @@ -38,9 +38,6 @@ # ifndef ID3_FRAME_COMPOSER # define ID3_FRAME_COMPOSER "TCOM" # endif -# ifndef ID3_FRAME_PERFORMER -# define ID3_FRAME_PERFORMER "TOPE" -# endif # ifndef ID3_FRAME_DISC # define ID3_FRAME_DISC "TPOS" # endif @@ -340,7 +337,8 @@ struct tag *tag_id3_import(struct id3_tag * tag) getID3Info(tag, ID3_FRAME_YEAR, TAG_ITEM_DATE, ret); getID3Info(tag, ID3_FRAME_GENRE, TAG_ITEM_GENRE, ret); getID3Info(tag, ID3_FRAME_COMPOSER, TAG_ITEM_COMPOSER, ret); - getID3Info(tag, ID3_FRAME_PERFORMER, TAG_ITEM_PERFORMER, ret); + getID3Info(tag, "TPE3", TAG_ITEM_PERFORMER, ret); + getID3Info(tag, "TPE4", TAG_ITEM_PERFORMER, ret); getID3Info(tag, ID3_FRAME_COMMENT, TAG_ITEM_COMMENT, ret); getID3Info(tag, ID3_FRAME_DISC, TAG_ITEM_DISC, ret);