diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-13 16:12:45 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-13 16:12:45 +0200 |
| commit | ea616b3ed4c1e94f29ac32bcd7751943e2d647a0 (patch) | |
| tree | ad7aab07cba992b1aa728466bc1ffe5ca9e1e1a0 /src/tag_id3.c | |
| parent | a9dc0e816c0b6c0ed19a584225e3fe6251f1a4c6 (diff) | |
tag: removed the "_ITEM_" suffix from the enum names
Diffstat (limited to 'src/tag_id3.c')
| -rw-r--r-- | src/tag_id3.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/tag_id3.c b/src/tag_id3.c index c7898361..ad19062b 100644 --- a/src/tag_id3.c +++ b/src/tag_id3.c @@ -157,7 +157,7 @@ tag_id3_import_text(struct tag *dest, struct id3_tag *tag, const char *id, if (ucs4 == NULL) continue; - if (type == TAG_ITEM_GENRE) + if (type == TAG_GENRE) ucs4 = id3_genre_name(ucs4); utf8 = import_id3_string(tag_is_id3v1(tag), ucs4); @@ -311,23 +311,23 @@ struct tag *tag_id3_import(struct id3_tag * tag) { struct tag *ret = tag_new(); - tag_id3_import_text(ret, tag, ID3_FRAME_ARTIST, TAG_ITEM_ARTIST); + tag_id3_import_text(ret, tag, ID3_FRAME_ARTIST, TAG_ARTIST); tag_id3_import_text(ret, tag, ID3_FRAME_ALBUM_ARTIST, - TAG_ITEM_ALBUM_ARTIST); + TAG_ALBUM_ARTIST); tag_id3_import_text(ret, tag, ID3_FRAME_ARTIST_SORT, TAG_ARTIST_SORT); tag_id3_import_text(ret, tag, ID3_FRAME_ALBUM_ARTIST_SORT, TAG_ALBUM_ARTIST_SORT); - tag_id3_import_text(ret, tag, ID3_FRAME_TITLE, TAG_ITEM_TITLE); - tag_id3_import_text(ret, tag, ID3_FRAME_ALBUM, TAG_ITEM_ALBUM); - tag_id3_import_text(ret, tag, ID3_FRAME_TRACK, TAG_ITEM_TRACK); - tag_id3_import_text(ret, tag, ID3_FRAME_YEAR, TAG_ITEM_DATE); - tag_id3_import_text(ret, tag, ID3_FRAME_GENRE, TAG_ITEM_GENRE); - tag_id3_import_text(ret, tag, ID3_FRAME_COMPOSER, TAG_ITEM_COMPOSER); - tag_id3_import_text(ret, tag, "TPE3", TAG_ITEM_PERFORMER); - tag_id3_import_text(ret, tag, "TPE4", TAG_ITEM_PERFORMER); - tag_id3_import_comment(ret, tag, ID3_FRAME_COMMENT, TAG_ITEM_COMMENT); - tag_id3_import_text(ret, tag, ID3_FRAME_DISC, TAG_ITEM_DISC); + tag_id3_import_text(ret, tag, ID3_FRAME_TITLE, TAG_TITLE); + tag_id3_import_text(ret, tag, ID3_FRAME_ALBUM, TAG_ALBUM); + tag_id3_import_text(ret, tag, ID3_FRAME_TRACK, TAG_TRACK); + tag_id3_import_text(ret, tag, ID3_FRAME_YEAR, TAG_DATE); + tag_id3_import_text(ret, tag, ID3_FRAME_GENRE, TAG_GENRE); + tag_id3_import_text(ret, tag, ID3_FRAME_COMPOSER, TAG_COMPOSER); + tag_id3_import_text(ret, tag, "TPE3", TAG_PERFORMER); + tag_id3_import_text(ret, tag, "TPE4", TAG_PERFORMER); + tag_id3_import_comment(ret, tag, ID3_FRAME_COMMENT, TAG_COMMENT); + tag_id3_import_text(ret, tag, ID3_FRAME_DISC, TAG_DISC); tag_id3_import_musicbrainz(ret, tag); tag_id3_import_ufid(ret, tag); |