len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename 'mp3entry.embed_albumart' to 'mp3entry.has_embedded_albumart' (FS#12470). No functional changes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31405 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Alexander Levin 2011-12-22 18:48:43 +00:00
parent 5b5871bd01
commit 63c4ef9f57
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/hosted/android/notification.c
View file

@ -68,7 +68,7 @@ static void track_changed_callback(void *param)
album = e->NewStringUTF(env_ptr, id3->album ?: ""); album = e->NewStringUTF(env_ptr, id3->album ?: "");
albumart = NULL; 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() */ { /* extract albumart to a temporary file using mmap() */
snprintf(buf, sizeof(buf), "/sdcard/rockbox/.temp_albumart_%d.jpg", snprintf(buf, sizeof(buf), "/sdcard/rockbox/.temp_albumart_%d.jpg",
thread_self()); thread_self());

2
apps/metadata.h
View file

@ -317,7 +317,7 @@ struct mp3entry {
#endif #endif
#ifdef HAVE_ALBUMART #ifdef HAVE_ALBUMART
bool embed_albumart; bool has_embedded_albumart;
struct mp3_albumart albumart; struct mp3_albumart albumart;
#endif #endif

2
apps/metadata/ape.c
View file

@ -159,7 +159,7 @@ bool read_ape_tags(int fd, struct mp3entry* id3)
{ {
id3->albumart.pos = lseek(fd, 0, SEEK_CUR); id3->albumart.pos = lseek(fd, 0, SEEK_CUR);
id3->albumart.size = item.length - r; id3->albumart.size = item.length - r;
id3->embed_albumart = true; id3->has_embedded_albumart = true;
} }
/* Seek back to this APE items begin. */ /* Seek back to this APE items begin. */

2
apps/metadata/asf.c
View file

@ -503,7 +503,7 @@ static int asf_parse_header(int fd, struct mp3entry* id3,
if (id3->albumart.type != AA_TYPE_UNKNOWN) { if (id3->albumart.type != AA_TYPE_UNKNOWN) {
id3->albumart.pos = lseek(fd, 0, SEEK_CUR); id3->albumart.pos = lseek(fd, 0, SEEK_CUR);
id3->albumart.size = datalength; id3->albumart.size = datalength;
id3->embed_albumart = true; id3->has_embedded_albumart = true;
} }
} }

6
apps/metadata/id3tags.c
View file

@ -301,7 +301,7 @@ static int parsegenre( struct mp3entry* entry, char* tag, int bufferpos )
/* parse embed albumart */ /* parse embed albumart */
static int parsealbumart( struct mp3entry* entry, char* tag, int bufferpos ) 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 */ /* we currently don't support unsynchronizing albumart */
if (entry->albumart.type == AA_TYPE_UNSYNC) 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 */ /* fixup offset&size for image data */
entry->albumart.pos += tag - start; entry->albumart.pos += tag - start;
entry->albumart.size -= 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 as we didn't store anything in id3v2buf */
return bufferpos; return bufferpos;
@ -1075,7 +1075,7 @@ void setid3v2title(int fd, struct mp3entry *entry)
#ifdef HAVE_ALBUMART #ifdef HAVE_ALBUMART
/* albumart */ /* albumart */
if ((!entry->embed_albumart) && if ((!entry->has_embedded_albumart) &&
((tr->tag_length == 4 && !memcmp( header, "APIC", 4)) || ((tr->tag_length == 4 && !memcmp( header, "APIC", 4)) ||
(tr->tag_length == 3 && !memcmp( header, "PIC" , 3)))) (tr->tag_length == 3 && !memcmp( header, "PIC" , 3))))
{ {

2
apps/metadata/mp4.c
View file

@ -487,7 +487,7 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3,
{ {
id3->albumart.pos = pos; id3->albumart.pos = pos;
id3->albumart.size = size - 16; id3->albumart.size = size - 16;
id3->embed_albumart = true; id3->has_embedded_albumart = true;
} }
} }
break; break;

2
apps/playback.c
View file

@ -1559,7 +1559,7 @@ static bool audio_load_albumart(struct track_info *info,
#endif #endif
/* We can only decode jpeg for embedded AA */ /* 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; user_data.embedded_albumart = &track_id3->albumart;
hid = bufopen(track_id3->path, 0, TYPE_BITMAP, &user_data); hid = bufopen(track_id3->path, 0, TYPE_BITMAP, &user_data);