diff options
| author | Max Kellermann <max@duempel.org> | 2012-09-05 22:56:57 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-09-05 22:56:57 +0200 |
| commit | bab756a5d06463f992ece8c9ec0a5dfb8e4007c9 (patch) | |
| tree | 0c2ba2eb5637edc73cc1f8c9b29946dd6d5bff48 /src/decoder/vorbis_comments.c | |
| parent | 8c763fe4586ac0d259ca9974ea4d768eb555cb5d (diff) | |
| download | mpd-bab756a5d06463f992ece8c9ec0a5dfb8e4007c9.tar.gz mpd-bab756a5d06463f992ece8c9ec0a5dfb8e4007c9.tar.xz mpd-bab756a5d06463f992ece8c9ec0a5dfb8e4007c9.zip | |
decoder/{flac,vorbis}: move tag table to XiphTags.c
Merge duplicate data.
Diffstat (limited to 'src/decoder/vorbis_comments.c')
| -rw-r--r-- | src/decoder/vorbis_comments.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/decoder/vorbis_comments.c b/src/decoder/vorbis_comments.c index 6c2d57b72..84f7c5014 100644 --- a/src/decoder/vorbis_comments.c +++ b/src/decoder/vorbis_comments.c @@ -19,6 +19,7 @@ #include "config.h" #include "vorbis_comments.h" +#include "XiphTags.h" #include "tag.h" #include "tag_table.h" #include "tag_handler.h" @@ -95,13 +96,6 @@ vorbis_copy_comment(const char *comment, return false; } -static const struct tag_table vorbis_tags[] = { - { "tracknumber", TAG_TRACK }, - { "discnumber", TAG_DISC }, - { "album artist", TAG_ALBUM_ARTIST }, - { NULL, TAG_NUM_OF_ITEM_TYPES } -}; - static void vorbis_scan_comment(const char *comment, const struct tag_handler *handler, void *handler_ctx) @@ -119,7 +113,7 @@ vorbis_scan_comment(const char *comment, g_free(name); } - for (const struct tag_table *i = vorbis_tags; i->name != NULL; ++i) + for (const struct tag_table *i = xiph_tags; i->name != NULL; ++i) if (vorbis_copy_comment(comment, i->name, i->type, handler, handler_ctx)) return; |