summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-12-03 15:38:39 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-12-03 15:38:39 +0000
commitd1f8001984df5abfd41bd7158c3f775a2eac0d42 (patch)
tree31dbf4e50e1dcb3290f81978516a7af78bca5377
parentd98bba864c3cf1438571d34ab37830fa733b5932 (diff)
downloadrockbox-d1f8001984df5abfd41bd7158c3f775a2eac0d42.zip
rockbox-d1f8001984df5abfd41bd7158c3f775a2eac0d42.tar.gz
rockbox-d1f8001984df5abfd41bd7158c3f775a2eac0d42.tar.bz2
rockbox-d1f8001984df5abfd41bd7158c3f775a2eac0d42.tar.xz
Don't waste time loading v1 tag if a v2 tag was found.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2916 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/id3.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/firmware/id3.c b/firmware/id3.c
index 3ee25ca..ed2724f 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -737,9 +737,12 @@ bool mp3info(struct mp3entry *entry, char *filename)
setid3v2title(fd, entry);
entry->length = getsonglength(fd, entry);
- entry->id3v1len = getid3v1len(fd);
- if(entry->id3v1len && !entry->title)
- setid3v1title(fd, entry);
+ /* only seek to end of file if no id3v2 tags were found */
+ if (!entry->id3v2len) {
+ entry->id3v1len = getid3v1len(fd);
+ if(entry->id3v1len && !entry->title)
+ setid3v1title(fd, entry);
+ }
close(fd);