oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag/Id3Load: add constant ID3V1_SIZE

Browse Source
This commit is contained in:
Max Kellermann 2016-02-22 12:33:55 +01:00
parent 283ef5b163
commit a224722ae2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tag/Id3Load.cxx
View File

@ -36,6 +36,8 @@
static constexpr Domain id3_domain("id3"); static constexpr Domain id3_domain("id3");
static constexpr size_t ID3V1_SIZE = 128;
gcc_pure gcc_pure
static inline bool static inline bool
tag_is_id3v1(struct id3_tag *tag) tag_is_id3v1(struct id3_tag *tag)
@ -137,10 +139,10 @@ static UniqueId3Tag
tag_id3_find_from_end(FILE *stream) tag_id3_find_from_end(FILE *stream)
{ {
/* Get an id3v1 tag from the end of file for later use */ /* Get an id3v1 tag from the end of file for later use */
auto v1tag = tag_id3_read(stream, -128, SEEK_END); auto v1tag = tag_id3_read(stream, -(off_t)ID3V1_SIZE, SEEK_END);
/* Get the id3v2 tag size from the footer (located before v1tag) */ /* Get the id3v2 tag size from the footer (located before v1tag) */
int tagsize = get_id3v2_footer_size(stream, (v1tag ? -128 : 0) - ID3_TAG_QUERYSIZE, SEEK_END); int tagsize = get_id3v2_footer_size(stream, (v1tag ? -(off_t)ID3V1_SIZE : 0) - ID3_TAG_QUERYSIZE, SEEK_END);
if (tagsize >= 0) if (tagsize >= 0)
return v1tag; return v1tag;