summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-06-26 14:51:09 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-06-26 14:51:09 +0000
commit1575ee378c3452e2146bb3689711562cfa445af9 (patch)
tree213f6e7332ce1975449f0126db48899c70989141
parent1b53042f27b41312d330da21e794920ca225da56 (diff)
downloadrockbox-1575ee378c3452e2146bb3689711562cfa445af9.tar.gz
rockbox-1575ee378c3452e2146bb3689711562cfa445af9.zip
Reordered operations to optimise file seeking
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1202 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/id3.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/firmware/id3.c b/firmware/id3.c
index f76edc96a3..bfddf90c6e 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -28,6 +28,7 @@
28#include <errno.h> 28#include <errno.h>
29#include <stdbool.h> 29#include <stdbool.h>
30#include "file.h" 30#include "file.h"
31#include "debug.h"
31 32
32#include "id3.h" 33#include "id3.h"
33 34
@@ -489,21 +490,19 @@ mp3info(struct mp3entry *entry, char *filename)
489 490
490 memset(entry, 0, sizeof(struct mp3entry)); 491 memset(entry, 0, sizeof(struct mp3entry));
491 492
492 entry->path = filename;
493
494 entry->filesize = getfilesize(fd);
495 entry->id3v2len = getid3v2len(fd);
496 entry->id3v1len = getid3v1len(fd);
497 entry->length = getsonglength(fd, entry);
498 entry->title = NULL; 493 entry->title = NULL;
499 494
500 495 entry->id3v2len = getid3v2len(fd);
501 if(HASID3V2(entry)) 496 if(HASID3V2(entry))
502 setid3v2title(fd, entry); 497 setid3v2title(fd, entry);
498 entry->length = getsonglength(fd, entry);
503 499
500 entry->id3v1len = getid3v1len(fd);
504 if(HASID3V1(entry) && !entry->title) 501 if(HASID3V1(entry) && !entry->title)
505 setid3v1title(fd, entry); 502 setid3v1title(fd, entry);
506 503
504 entry->filesize = getfilesize(fd);
505
507 close(fd); 506 close(fd);
508 507
509 return false; 508 return false;