diff options
-rw-r--r-- | apps/hosted/android/notification.c | 2 | ||||
-rw-r--r-- | apps/metadata.h | 2 | ||||
-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 | ||||
-rw-r--r-- | apps/playback.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/apps/hosted/android/notification.c b/apps/hosted/android/notification.c index 443200698c..2c814b06a6 100644 --- a/apps/hosted/android/notification.c +++ b/apps/hosted/android/notification.c | |||
@@ -68,7 +68,7 @@ static void track_changed_callback(void *param) | |||
68 | album = e->NewStringUTF(env_ptr, id3->album ?: ""); | 68 | album = e->NewStringUTF(env_ptr, id3->album ?: ""); |
69 | 69 | ||
70 | albumart = NULL; | 70 | albumart = NULL; |
71 | if (id3->embed_albumart && id3->albumart.type == AA_TYPE_JPG) | 71 | if (id3->has_embedded_albumart && id3->albumart.type == AA_TYPE_JPG) |
72 | { /* extract albumart to a temporary file using mmap() */ | 72 | { /* extract albumart to a temporary file using mmap() */ |
73 | snprintf(buf, sizeof(buf), "/sdcard/rockbox/.temp_albumart_%d.jpg", | 73 | snprintf(buf, sizeof(buf), "/sdcard/rockbox/.temp_albumart_%d.jpg", |
74 | thread_self()); | 74 | thread_self()); |
diff --git a/apps/metadata.h b/apps/metadata.h index a77300829e..707e5c2c37 100644 --- a/apps/metadata.h +++ b/apps/metadata.h | |||
@@ -317,7 +317,7 @@ struct mp3entry { | |||
317 | #endif | 317 | #endif |
318 | 318 | ||
319 | #ifdef HAVE_ALBUMART | 319 | #ifdef HAVE_ALBUMART |
320 | bool embed_albumart; | 320 | bool has_embedded_albumart; |
321 | struct mp3_albumart albumart; | 321 | struct mp3_albumart albumart; |
322 | #endif | 322 | #endif |
323 | 323 | ||
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; |
diff --git a/apps/playback.c b/apps/playback.c index 36fbd88832..8fe43eb884 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -1559,7 +1559,7 @@ static bool audio_load_albumart(struct track_info *info, | |||
1559 | #endif | 1559 | #endif |
1560 | 1560 | ||
1561 | /* We can only decode jpeg for embedded AA */ | 1561 | /* We can only decode jpeg for embedded AA */ |
1562 | if (track_id3->embed_albumart && track_id3->albumart.type == AA_TYPE_JPG) | 1562 | if (track_id3->has_embedded_albumart && track_id3->albumart.type == AA_TYPE_JPG) |
1563 | { | 1563 | { |
1564 | user_data.embedded_albumart = &track_id3->albumart; | 1564 | user_data.embedded_albumart = &track_id3->albumart; |
1565 | hid = bufopen(track_id3->path, 0, TYPE_BITMAP, &user_data); | 1565 | hid = bufopen(track_id3->path, 0, TYPE_BITMAP, &user_data); |