diff options
author | Max Kellermann <max@duempel.org> | 2012-02-11 10:37:59 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2012-02-11 12:37:24 +0100 |
commit | 9e5a49b8cb6d655bdab52232f390a4faa9253f99 (patch) | |
tree | b7d0cae68a9b2f7106d5952a64c2761611999d30 /src/tag_id3.c | |
parent | 767ade02f4af8cdb6b7de293d0bd433bc7fd24cf (diff) | |
download | mpd-9e5a49b8cb6d655bdab52232f390a4faa9253f99.tar.gz mpd-9e5a49b8cb6d655bdab52232f390a4faa9253f99.tar.xz mpd-9e5a49b8cb6d655bdab52232f390a4faa9253f99.zip |
tag_id3: use the tag_table library for TXXX
Diffstat (limited to 'src/tag_id3.c')
-rw-r--r-- | src/tag_id3.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/tag_id3.c b/src/tag_id3.c index 829b196b8..1facf3c18 100644 --- a/src/tag_id3.c +++ b/src/tag_id3.c @@ -19,6 +19,7 @@ #include "config.h" #include "tag_id3.h" +#include "tag_table.h" #include "tag.h" #include "riff.h" #include "aiff.h" @@ -242,23 +243,17 @@ tag_id3_import_comment(struct tag *dest, struct id3_tag *tag, const char *id, static enum tag_type tag_id3_parse_txxx_name(const char *name) { - static const struct { - enum tag_type type; - const char *name; - } musicbrainz_txxx[] = { - { TAG_ALBUM_ARTIST_SORT, "ALBUMARTISTSORT" }, - { TAG_MUSICBRAINZ_ARTISTID, "MusicBrainz Artist Id" }, - { TAG_MUSICBRAINZ_ALBUMID, "MusicBrainz Album Id" }, - { TAG_MUSICBRAINZ_ALBUMARTISTID, - "MusicBrainz Album Artist Id" }, - { TAG_MUSICBRAINZ_TRACKID, "MusicBrainz Track Id" }, + static const struct tag_table txxx_tags[] = { + { "ALBUMARTISTSORT", TAG_ALBUM_ARTIST_SORT }, + { "MusicBrainz Artist Id", TAG_MUSICBRAINZ_ARTISTID }, + { "MusicBrainz Album Id", TAG_MUSICBRAINZ_ALBUMID }, + { "MusicBrainz Album Artist Id", + TAG_MUSICBRAINZ_ALBUMARTISTID }, + { "MusicBrainz Track Id", TAG_MUSICBRAINZ_TRACKID }, + { NULL, TAG_NUM_OF_ITEM_TYPES } }; - for (unsigned i = 0; i < G_N_ELEMENTS(musicbrainz_txxx); ++i) - if (strcmp(name, musicbrainz_txxx[i].name) == 0) - return musicbrainz_txxx[i].type; - - return TAG_NUM_OF_ITEM_TYPES; + return tag_table_lookup(txxx_tags, name); } /** |