diff -u -r src/include/xmms/xmms_medialib.h src_new/include/xmms/xmms_medialib.h --- src/include/xmms/xmms_medialib.h 2009-07-05 21:54:08.000000000 +0400 +++ src_new/include/xmms/xmms_medialib.h 2009-07-05 21:54:19.000000000 +0400 @@ -34,6 +34,7 @@ #define XMMS_MEDIALIB_ENTRY_PROPERTY_TRACKNR "tracknr" #define XMMS_MEDIALIB_ENTRY_PROPERTY_GENRE "genre" #define XMMS_MEDIALIB_ENTRY_PROPERTY_BITRATE "bitrate" +#define XMMS_MEDIALIB_ENTRY_PROPERTY_CATNR "catnr" #define XMMS_MEDIALIB_ENTRY_PROPERTY_COMMENT "comment" #define XMMS_MEDIALIB_ENTRY_PROPERTY_COMMENT_LANG "commentlang" #define XMMS_MEDIALIB_ENTRY_PROPERTY_DURATION "duration" diff -u -r src/plugins/flac/flac.c src_new/plugins/flac/flac.c --- src/plugins/flac/flac.c 2009-07-05 22:41:34.000000000 +0400 +++ src_new/plugins/flac/flac.c 2009-07-05 22:43:55.000000000 +0400 @@ -334,9 +334,11 @@ { "tracknumber", XMMS_MEDIALIB_ENTRY_PROPERTY_TRACKNR, INTEGER }, { "date", XMMS_MEDIALIB_ENTRY_PROPERTY_YEAR, STRING }, { "genre", XMMS_MEDIALIB_ENTRY_PROPERTY_GENRE, STRING }, + { "catalognumber", XMMS_MEDIALIB_ENTRY_PROPERTY_CATNR, STRING }, { "comment", XMMS_MEDIALIB_ENTRY_PROPERTY_COMMENT, STRING }, { "description", XMMS_MEDIALIB_ENTRY_PROPERTY_DESCRIPTION, STRING }, { "discnumber", XMMS_MEDIALIB_ENTRY_PROPERTY_PARTOFSET, INTEGER }, + { "label", XMMS_MEDIALIB_ENTRY_PROPERTY_PUBLISHER, STRING }, { "musicbrainz_albumid", XMMS_MEDIALIB_ENTRY_PROPERTY_ALBUM_ID, STRING }, { "musicbrainz_artistid", XMMS_MEDIALIB_ENTRY_PROPERTY_ARTIST_ID, STRING }, { "musicbrainz_trackid", XMMS_MEDIALIB_ENTRY_PROPERTY_TRACK_ID, STRING }, diff -u -r src/plugins/id3v2/id3.c src_new/plugins/id3v2/id3.c --- src/plugins/id3v2/id3.c 2009-07-05 21:48:09.000000000 +0400 +++ src_new/plugins/id3v2/id3.c 2009-07-05 22:21:17.000000000 +0400 @@ -46,7 +46,7 @@ *>TCOM Composer *>TCON Content type * TCOP Copyright message - * TDAT Date + *>TDRC Recording time * TDLY Playlist delay * TENC Encoded by * TEXT Lyricist/Text writer @@ -291,6 +291,9 @@ (g_ascii_strcasecmp (val, MUSICBRAINZ_VA_ID) == 0)) { metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_COMPILATION; xmms_xform_metadata_set_int (xform, metakey, 1); + } else if (g_ascii_strcasecmp (key, "CATALOGNUMBER") == 0) { + metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_CATNR; + xmms_xform_metadata_set_str (xform, metakey, val); } else if (g_ascii_strcasecmp (key, "ASIN") == 0) { metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_ASIN; xmms_xform_metadata_set_str (xform, metakey, val); @@ -443,6 +446,7 @@ static struct id3tags_t tags[] = { { quad2long ('T','Y','E',0), XMMS_MEDIALIB_ENTRY_PROPERTY_YEAR, NULL }, { quad2long ('T','Y','E','R'), XMMS_MEDIALIB_ENTRY_PROPERTY_YEAR, NULL }, + { quad2long ('T','D','R','C'), XMMS_MEDIALIB_ENTRY_PROPERTY_YEAR, NULL }, { quad2long ('T','A','L',0), XMMS_MEDIALIB_ENTRY_PROPERTY_ALBUM, NULL }, { quad2long ('T','A','L','B'), XMMS_MEDIALIB_ENTRY_PROPERTY_ALBUM, NULL }, { quad2long ('T','T','2',0), XMMS_MEDIALIB_ENTRY_PROPERTY_TITLE, NULL },