From 5ebe33653c162a3a07a9a1fd71201e22fa152c6c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 30 Jun 2010 21:36:15 +0200 Subject: decoder/mp4ff: remove duplicate entries in the tag name table Reuse the function tag_name_parse_i(). --- src/decoder/mp4ff_plugin.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/decoder/mp4ff_plugin.c') diff --git a/src/decoder/mp4ff_plugin.c b/src/decoder/mp4ff_plugin.c index d94084e90..d34080493 100644 --- a/src/decoder/mp4ff_plugin.c +++ b/src/decoder/mp4ff_plugin.c @@ -341,14 +341,6 @@ mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream) } static const char *const mp4ff_tag_names[TAG_NUM_OF_ITEM_TYPES] = { - [TAG_ITEM_TITLE] = "title", - [TAG_ITEM_ARTIST] = "artist", - [TAG_ITEM_ALBUM] = "album", - [TAG_ITEM_ALBUM_ARTIST] = "albumartist", - [TAG_ITEM_TRACK] = "track", - [TAG_ITEM_DISC] = "disc", - [TAG_ITEM_GENRE] = "genre", - [TAG_ITEM_DATE] = "date", [TAG_ITEM_COMPOSER] = "writer", [TAG_ITEM_PERFORMER] = "band", }; @@ -356,7 +348,11 @@ static const char *const mp4ff_tag_names[TAG_NUM_OF_ITEM_TYPES] = { static enum tag_type mp4ff_tag_name_parse(const char *name) { - return tag_table_lookup(mp4ff_tag_names, name); + enum tag_type type = tag_table_lookup(mp4ff_tag_names, name); + if (type == TAG_NUM_OF_ITEM_TYPES) + type = tag_name_parse_i(name); + + return type; } static struct tag * -- cgit v1.2.3