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) album = e->NewStringUTF(env_ptr, id3->album ?: ""); albumart = NULL; - if (id3->embed_albumart && id3->albumart.type == AA_TYPE_JPG) + if (id3->has_embedded_albumart && id3->albumart.type == AA_TYPE_JPG) { /* extract albumart to a temporary file using mmap() */ snprintf(buf, sizeof(buf), "/sdcard/rockbox/.temp_albumart_%d.jpg", 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 { #endif #ifdef HAVE_ALBUMART - bool embed_albumart; + bool has_embedded_albumart; struct mp3_albumart albumart; #endif 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) { id3->albumart.pos = lseek(fd, 0, SEEK_CUR); id3->albumart.size = item.length - r; - id3->embed_albumart = true; + id3->has_embedded_albumart = true; } /* 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, if (id3->albumart.type != AA_TYPE_UNKNOWN) { id3->albumart.pos = lseek(fd, 0, SEEK_CUR); id3->albumart.size = datalength; - id3->embed_albumart = true; + id3->has_embedded_albumart = true; } } 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 ) /* parse embed albumart */ static int parsealbumart( struct mp3entry* entry, char* tag, int bufferpos ) { - entry->embed_albumart = false; + entry->has_embedded_albumart = false; /* we currently don't support unsynchronizing albumart */ if (entry->albumart.type == AA_TYPE_UNSYNC) @@ -347,7 +347,7 @@ static int parsealbumart( struct mp3entry* entry, char* tag, int bufferpos ) /* fixup offset&size for image data */ entry->albumart.pos += tag - start; entry->albumart.size -= tag - start; - entry->embed_albumart = true; + entry->has_embedded_albumart = true; } /* return bufferpos as we didn't store anything in id3v2buf */ return bufferpos; @@ -1075,7 +1075,7 @@ void setid3v2title(int fd, struct mp3entry *entry) #ifdef HAVE_ALBUMART /* albumart */ - if ((!entry->embed_albumart) && + if ((!entry->has_embedded_albumart) && ((tr->tag_length == 4 && !memcmp( header, "APIC", 4)) || (tr->tag_length == 3 && !memcmp( header, "PIC" , 3)))) { 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, { id3->albumart.pos = pos; id3->albumart.size = size - 16; - id3->embed_albumart = true; + id3->has_embedded_albumart = true; } } 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, #endif /* We can only decode jpeg for embedded AA */ - if (track_id3->embed_albumart && track_id3->albumart.type == AA_TYPE_JPG) + if (track_id3->has_embedded_albumart && track_id3->albumart.type == AA_TYPE_JPG) { user_data.embedded_albumart = &track_id3->albumart; hid = bufopen(track_id3->path, 0, TYPE_BITMAP, &user_data); |