diff options
author | Björn Stenberg <bjorn@haxx.se> | 2003-02-11 15:00:56 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2003-02-11 15:00:56 +0000 |
commit | 5b1644336c790d7a6b171f95302a7e09c396fd00 (patch) | |
tree | 60f8a2d2edafa7bdbf333d6226161822c47abb8d /firmware | |
parent | b4902aff713c4c9bbc0c99a0c4211c79f6b4cbed (diff) | |
download | rockbox-5b1644336c790d7a6b171f95302a7e09c396fd00.tar.gz rockbox-5b1644336c790d7a6b171f95302a7e09c396fd00.zip |
Initialize genre to 0xff since 0 is a valid value.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3233 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/id3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/firmware/id3.c b/firmware/id3.c index 841d735eec..8e8a60eb71 100644 --- a/firmware/id3.c +++ b/firmware/id3.c | |||
@@ -368,8 +368,6 @@ static void setid3v2title(int fd, struct mp3entry *entry) | |||
368 | bytesread = read(fd, ptr, framelen); | 368 | bytesread = read(fd, ptr, framelen); |
369 | if (ptr[1] == '(' && ptr[2] != '(') | 369 | if (ptr[1] == '(' && ptr[2] != '(') |
370 | entry->genre = atoi(ptr+2); | 370 | entry->genre = atoi(ptr+2); |
371 | else | ||
372 | entry->genre = 0xff; | ||
373 | bufferpos += bytesread + 1; | 371 | bufferpos += bytesread + 1; |
374 | size -= bytesread; | 372 | size -= bytesread; |
375 | } | 373 | } |
@@ -746,6 +744,7 @@ bool mp3info(struct mp3entry *entry, char *filename) | |||
746 | entry->filesize = getfilesize(fd); | 744 | entry->filesize = getfilesize(fd); |
747 | entry->id3v2len = getid3v2len(fd); | 745 | entry->id3v2len = getid3v2len(fd); |
748 | entry->tracknum = 0; | 746 | entry->tracknum = 0; |
747 | entry->genre = 0xff; | ||
749 | 748 | ||
750 | if (entry->id3v2len) | 749 | if (entry->id3v2len) |
751 | setid3v2title(fd, entry); | 750 | setid3v2title(fd, entry); |