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

Ignore duplicate id3v2 tags or frames. Patch by Bill Napier.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3413 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2003-03-10 15:43:16 +00:00
parent a1598b5836
commit fac3bc581a
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
firmware/id3.c
View file

@ -243,7 +243,9 @@ static void setid3v2title(int fd, struct mp3entry *entry)
return; return;
} }
entry->id3version = version; entry->id3version = version;
entry->tracknum = entry->year = entry->genre = 0;
entry->title = entry->artist = entry->album = NULL;
/* Skip the extended header if it is present */ /* Skip the extended header if it is present */
if(version >= ID3_VER_2_4) { if(version >= ID3_VER_2_4) {
if(header[5] & 0x40) { if(header[5] & 0x40) {
@ -334,8 +336,9 @@ static void setid3v2title(int fd, struct mp3entry *entry)
DEBUGF("id3v2 frame: %.4s\n", header); DEBUGF("id3v2 frame: %.4s\n", header);
/* Check for certain frame headers */ /* Check for certain frame headers */
if(!strncmp(header, "TPE1", strlen("TPE1")) || if (!entry->artist &&
!strncmp(header, "TP1", strlen("TP1"))) { (!strncmp(header, "TPE1", strlen("TPE1")) ||
!strncmp(header, "TP1", strlen("TP1")))) {
bytesread = read(fd, buffer + bufferpos, framelen); bytesread = read(fd, buffer + bufferpos, framelen);
entry->artist = buffer + bufferpos; entry->artist = buffer + bufferpos;
unicode_munge(&entry->artist, &bytesread); unicode_munge(&entry->artist, &bytesread);
@ -343,8 +346,9 @@ static void setid3v2title(int fd, struct mp3entry *entry)
bufferpos += bytesread + 2; bufferpos += bytesread + 2;
size -= bytesread; size -= bytesread;
} }
else if(!strncmp(header, "TIT2", strlen("TIT2")) || else if (!entry->artist &&
!strncmp(header, "TT2", strlen("TT2"))) { (!strncmp(header, "TIT2", strlen("TIT2")) ||
!strncmp(header, "TT2", strlen("TT2")))) {
bytesread = read(fd, buffer + bufferpos, framelen); bytesread = read(fd, buffer + bufferpos, framelen);
entry->title = buffer + bufferpos; entry->title = buffer + bufferpos;
unicode_munge(&entry->title, &bytesread); unicode_munge(&entry->title, &bytesread);
@ -352,7 +356,8 @@ static void setid3v2title(int fd, struct mp3entry *entry)
bufferpos += bytesread + 2; bufferpos += bytesread + 2;
size -= bytesread; size -= bytesread;
} }
else if(!strncmp(header, "TALB", strlen("TALB"))) { else if( !entry->album &&
!strncmp(header, "TALB", strlen("TALB"))) {
bytesread = read(fd, buffer + bufferpos, framelen); bytesread = read(fd, buffer + bufferpos, framelen);
entry->album = buffer + bufferpos; entry->album = buffer + bufferpos;
unicode_munge(&entry->album, &bytesread); unicode_munge(&entry->album, &bytesread);
@ -360,7 +365,8 @@ static void setid3v2title(int fd, struct mp3entry *entry)
bufferpos += bytesread + 2; bufferpos += bytesread + 2;
size -= bytesread; size -= bytesread;
} }
else if(!strncmp(header, "TRCK", strlen("TRCK"))) { else if (!entry->tracknum &&
!strncmp(header, "TRCK", strlen("TRCK"))) {
bytesread = read(fd, buffer + bufferpos, framelen); bytesread = read(fd, buffer + bufferpos, framelen);
tracknum = buffer + bufferpos; tracknum = buffer + bufferpos;
unicode_munge(&tracknum, &bytesread); unicode_munge(&tracknum, &bytesread);
@ -369,8 +375,9 @@ static void setid3v2title(int fd, struct mp3entry *entry)
bufferpos += bytesread + 1; bufferpos += bytesread + 1;
size -= bytesread; size -= bytesread;
} }
else if(!strncmp(header, "TYER", 4) || else if (!entry->year &&
!strncmp(header, "TYR", 3)) { (!strncmp(header, "TYER", 4) ||
!strncmp(header, "TYR", 3))) {
char* ptr = buffer + bufferpos; char* ptr = buffer + bufferpos;
bytesread = read(fd, ptr, framelen); bytesread = read(fd, ptr, framelen);
unicode_munge(&ptr, &bytesread); unicode_munge(&ptr, &bytesread);
@ -378,7 +385,8 @@ static void setid3v2title(int fd, struct mp3entry *entry)
bufferpos += bytesread + 1; bufferpos += bytesread + 1;
size -= bytesread; size -= bytesread;
} }
else if(!strncmp(header, "TCON", 4)) { else if (!entry->genre &&
!strncmp(header, "TCON", 4)) {
char* ptr = buffer + bufferpos; char* ptr = buffer + bufferpos;
bytesread = read(fd, ptr, framelen); bytesread = read(fd, ptr, framelen);
if (ptr[1] == '(' && ptr[2] != '(') if (ptr[1] == '(' && ptr[2] != '(')