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/flac_metadata.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/flac_metadata.c')
| -rw-r--r-- | src/decoder/flac_metadata.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/decoder/flac_metadata.c b/src/decoder/flac_metadata.c index bd1eaf323..a2eaafdfa 100644 --- a/src/decoder/flac_metadata.c +++ b/src/decoder/flac_metadata.c @@ -19,6 +19,7 @@ #include "config.h" #include "flac_metadata.h" +#include "XiphTags.h" #include "replay_gain_info.h" #include "tag.h" #include "tag_handler.h" @@ -184,13 +185,6 @@ flac_copy_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry, return false; } -static const struct tag_table flac_tags[] = { - { "tracknumber", TAG_TRACK }, - { "discnumber", TAG_DISC }, - { "album artist", TAG_ALBUM_ARTIST }, - { NULL, TAG_NUM_OF_ITEM_TYPES } -}; - static void flac_scan_comment(const char *char_tnum, const FLAC__StreamMetadata_VorbisComment_Entry *entry, @@ -209,7 +203,7 @@ flac_scan_comment(const char *char_tnum, g_free(name); } - for (const struct tag_table *i = flac_tags; i->name != NULL; ++i) + for (const struct tag_table *i = xiph_tags; i->name != NULL; ++i) if (flac_copy_comment(entry, i->name, i->type, char_tnum, handler, handler_ctx)) return; |