devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

No functional changes, just coding tweaks for speed, codesize and style

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15843 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2007-11-28 16:39:55 +00:00
parent df0df311dc
commit 3e7f02e007
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
apps/metadata.c
View file

@ -328,7 +328,6 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname)
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
void strip_tags(int handle_id) void strip_tags(int handle_id)
{ {
int i;
static const unsigned char tag[] = "TAG"; static const unsigned char tag[] = "TAG";
static const unsigned char apetag[] = "APETAGEX"; static const unsigned char apetag[] = "APETAGEX";
size_t len, version; size_t len, version;
@ -337,27 +336,24 @@ void strip_tags(int handle_id)
if (bufgettail(handle_id, 128, (void **)&tail) != 128) if (bufgettail(handle_id, 128, (void **)&tail) != 128)
return; return;
for(i = 0;i < 3;i++) if (memcmp(tail, tag, 3) == 0)
if(tail[i] != tag[i]) {
goto strip_ape_tag; /* Skip id3v1 tag */
logf("Cutting off ID3v1 tag");
/* Skip id3v1 tag */ bufcuttail(handle_id, 128);
logf("Cutting off ID3v1 tag"); }
bufcuttail(handle_id, 128);
strip_ape_tag:
/* Check for APE tag (look for the APE tag footer) */
/* Get a new tail, as the old one may have been cut */
if (bufgettail(handle_id, 32, (void **)&tail) != 32) if (bufgettail(handle_id, 32, (void **)&tail) != 32)
return; return;
for(i = 0;i < 8;i++) /* Check for APE tag (look for the APE tag footer) */
if(tail[i] != apetag[i]) if (memcmp(tail, apetag, 8) != 0)
return; return;
/* Read the version and length from the footer */ /* Read the version and length from the footer */
version = tail[8] | (tail[9] << 8) | (tail[10] << 16) | (tail[11] << 24); version = get_long_le(&tail[8]);
len = tail[12] | (tail[13] << 8) | (tail[14] << 16) | (tail[15] << 24); len = get_long_le(&tail[12]);
if (version == 2000) if (version == 2000)
len += 32; /* APEv2 has a 32 byte header */ len += 32; /* APEv2 has a 32 byte header */