diff options
| author | Max Kellermann <max@musicpd.org> | 2018-10-22 09:44:12 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-10-22 09:44:36 +0200 |
| commit | 92541dedc0316d76eaa195328fea427098262335 (patch) | |
| tree | 0f1dc6920e5e73801c52a0e209de30677222ec2e /src | |
| parent | 650a67dc38b3870b8a4f6fc2912705da61df530f (diff) | |
| parent | fbea965c70df39fbf649db71d3d37a0e0b108e25 (diff) | |
Merge branch 'master' of git://github.com/skidoo23/MPD
Diffstat (limited to 'src')
| -rw-r--r-- | src/tag/Id3Scan.cxx | 21 | ||||
| -rw-r--r-- | src/tag/Names.c | 3 | ||||
| -rw-r--r-- | src/tag/Type.h | 3 |
3 files changed, 18 insertions, 9 deletions
diff --git a/src/tag/Id3Scan.cxx b/src/tag/Id3Scan.cxx index d7afaf7cf..6d1dd970f 100644 --- a/src/tag/Id3Scan.cxx +++ b/src/tag/Id3Scan.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2003-2017 The Music Player Daemon Project + * Copyright 2003-2018 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -38,12 +38,13 @@ #include <string.h> #include <stdlib.h> -# ifndef ID3_FRAME_COMPOSER -# define ID3_FRAME_COMPOSER "TCOM" -# endif -# ifndef ID3_FRAME_DISC -# define ID3_FRAME_DISC "TPOS" -# endif +#ifndef ID3_FRAME_COMPOSER +#define ID3_FRAME_COMPOSER "TCOM" +#endif + +#ifndef ID3_FRAME_DISC +#define ID3_FRAME_DISC "TPOS" +#endif #ifndef ID3_FRAME_ARTIST_SORT #define ID3_FRAME_ARTIST_SORT "TSOP" @@ -61,6 +62,10 @@ #define ID3_FRAME_ORIGINAL_RELEASE_DATE "TDOR" #endif +#ifndef ID3_FRAME_LABEL +#define ID3_FRAME_LABEL "TPUB" +#endif + gcc_pure static id3_utf8_t * tag_id3_getstring(const struct id3_frame *frame, unsigned i) noexcept @@ -317,6 +322,8 @@ scan_id3_tag(const struct id3_tag *tag, TagHandler &handler) noexcept handler); tag_id3_import_text(tag, ID3_FRAME_DISC, TAG_DISC, handler); + tag_id3_import_text(tag, ID3_FRAME_LABEL, TAG_LABEL, + handler); tag_id3_import_musicbrainz(tag, handler); tag_id3_import_ufid(tag, handler); diff --git a/src/tag/Names.c b/src/tag/Names.c index 5657e5f80..5a4de3b4a 100644 --- a/src/tag/Names.c +++ b/src/tag/Names.c @@ -1,5 +1,5 @@ /* - * Copyright 2003-2017 The Music Player Daemon Project + * Copyright 2003-2018 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -37,6 +37,7 @@ const char *const tag_item_names[TAG_NUM_OF_ITEM_TYPES] = { [TAG_PERFORMER] = "Performer", [TAG_COMMENT] = "Comment", [TAG_DISC] = "Disc", + [TAG_LABEL] = "Label", /* MusicBrainz tags from http://musicbrainz.org/doc/MusicBrainzTag */ [TAG_MUSICBRAINZ_ARTISTID] = "MUSICBRAINZ_ARTISTID", diff --git a/src/tag/Type.h b/src/tag/Type.h index 8e9d603b5..07429688e 100644 --- a/src/tag/Type.h +++ b/src/tag/Type.h @@ -1,5 +1,5 @@ /* - * Copyright 2003-2017 The Music Player Daemon Project + * Copyright 2003-2018 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -51,6 +51,7 @@ enum TagType TAG_PERFORMER, TAG_COMMENT, TAG_DISC, + TAG_LABEL, TAG_MUSICBRAINZ_ARTISTID, TAG_MUSICBRAINZ_ALBUMID, |