diff options
author | Alexander Levin <al.le@rockbox.org> | 2011-12-22 18:48:43 +0000 |
---|---|---|
committer | Alexander Levin <al.le@rockbox.org> | 2011-12-22 18:48:43 +0000 |
commit | 63c4ef9f57fa6947f9244e087180d9d5781c1032 (patch) | |
tree | 6ca4feb33d1b0cd8a63b06f291fa3b5e24032ef5 /apps/metadata | |
parent | 5b5871bd011095e11cc31a247dc9b2e104c79d79 (diff) | |
download | rockbox-63c4ef9f57fa6947f9244e087180d9d5781c1032.tar.gz rockbox-63c4ef9f57fa6947f9244e087180d9d5781c1032.zip |
Rename 'mp3entry.embed_albumart' to 'mp3entry.has_embedded_albumart' (FS#12470). No functional changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31405 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/metadata')
-rw-r--r-- | apps/metadata/ape.c | 2 | ||||
-rw-r--r-- | apps/metadata/asf.c | 2 | ||||
-rw-r--r-- | apps/metadata/id3tags.c | 6 | ||||
-rw-r--r-- | apps/metadata/mp4.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/apps/metadata/ape.c b/apps/metadata/ape.c index 8fe296c2d9..0bd2477431 100644 --- a/apps/metadata/ape.c +++ b/apps/metadata/ape.c | |||
@@ -159,7 +159,7 @@ bool read_ape_tags(int fd, struct mp3entry* id3) | |||
159 | { | 159 | { |
160 | id3->albumart.pos = lseek(fd, 0, SEEK_CUR); | 160 | id3->albumart.pos = lseek(fd, 0, SEEK_CUR); |
161 | id3->albumart.size = item.length - r; | 161 | id3->albumart.size = item.length - r; |
162 | id3->embed_albumart = true; | 162 | id3->has_embedded_albumart = true; |
163 | } | 163 | } |
164 | 164 | ||
165 | /* Seek back to this APE items begin. */ | 165 | /* Seek back to this APE items begin. */ |
diff --git a/apps/metadata/asf.c b/apps/metadata/asf.c index f5532fa628..b815c09769 100644 --- a/apps/metadata/asf.c +++ b/apps/metadata/asf.c | |||
@@ -503,7 +503,7 @@ static int asf_parse_header(int fd, struct mp3entry* id3, | |||
503 | if (id3->albumart.type != AA_TYPE_UNKNOWN) { | 503 | if (id3->albumart.type != AA_TYPE_UNKNOWN) { |
504 | id3->albumart.pos = lseek(fd, 0, SEEK_CUR); | 504 | id3->albumart.pos = lseek(fd, 0, SEEK_CUR); |
505 | id3->albumart.size = datalength; | 505 | id3->albumart.size = datalength; |
506 | id3->embed_albumart = true; | 506 | id3->has_embedded_albumart = true; |
507 | } | 507 | } |
508 | } | 508 | } |
509 | 509 | ||
diff --git a/apps/metadata/id3tags.c b/apps/metadata/id3tags.c index dcb80347db..85025c61b1 100644 --- a/apps/metadata/id3tags.c +++ b/apps/metadata/id3tags.c | |||
@@ -301,7 +301,7 @@ static int parsegenre( struct mp3entry* entry, char* tag, int bufferpos ) | |||
301 | /* parse embed albumart */ | 301 | /* parse embed albumart */ |
302 | static int parsealbumart( struct mp3entry* entry, char* tag, int bufferpos ) | 302 | static int parsealbumart( struct mp3entry* entry, char* tag, int bufferpos ) |
303 | { | 303 | { |
304 | entry->embed_albumart = false; | 304 | entry->has_embedded_albumart = false; |
305 | 305 | ||
306 | /* we currently don't support unsynchronizing albumart */ | 306 | /* we currently don't support unsynchronizing albumart */ |
307 | if (entry->albumart.type == AA_TYPE_UNSYNC) | 307 | if (entry->albumart.type == AA_TYPE_UNSYNC) |
@@ -347,7 +347,7 @@ static int parsealbumart( struct mp3entry* entry, char* tag, int bufferpos ) | |||
347 | /* fixup offset&size for image data */ | 347 | /* fixup offset&size for image data */ |
348 | entry->albumart.pos += tag - start; | 348 | entry->albumart.pos += tag - start; |
349 | entry->albumart.size -= tag - start; | 349 | entry->albumart.size -= tag - start; |
350 | entry->embed_albumart = true; | 350 | entry->has_embedded_albumart = true; |
351 | } | 351 | } |
352 | /* return bufferpos as we didn't store anything in id3v2buf */ | 352 | /* return bufferpos as we didn't store anything in id3v2buf */ |
353 | return bufferpos; | 353 | return bufferpos; |
@@ -1075,7 +1075,7 @@ void setid3v2title(int fd, struct mp3entry *entry) | |||
1075 | 1075 | ||
1076 | #ifdef HAVE_ALBUMART | 1076 | #ifdef HAVE_ALBUMART |
1077 | /* albumart */ | 1077 | /* albumart */ |
1078 | if ((!entry->embed_albumart) && | 1078 | if ((!entry->has_embedded_albumart) && |
1079 | ((tr->tag_length == 4 && !memcmp( header, "APIC", 4)) || | 1079 | ((tr->tag_length == 4 && !memcmp( header, "APIC", 4)) || |
1080 | (tr->tag_length == 3 && !memcmp( header, "PIC" , 3)))) | 1080 | (tr->tag_length == 3 && !memcmp( header, "PIC" , 3)))) |
1081 | { | 1081 | { |
diff --git a/apps/metadata/mp4.c b/apps/metadata/mp4.c index 4feb56cf98..df164436f5 100644 --- a/apps/metadata/mp4.c +++ b/apps/metadata/mp4.c | |||
@@ -487,7 +487,7 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3, | |||
487 | { | 487 | { |
488 | id3->albumart.pos = pos; | 488 | id3->albumart.pos = pos; |
489 | id3->albumart.size = size - 16; | 489 | id3->albumart.size = size - 16; |
490 | id3->embed_albumart = true; | 490 | id3->has_embedded_albumart = true; |
491 | } | 491 | } |
492 | } | 492 | } |
493 | break; | 493 | break; |