diff options
author | Robert Kukla <roolku@rockbox.org> | 2007-03-02 21:49:42 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2007-03-02 21:49:42 +0000 |
commit | 79a2a936a289ed7dc6e997b6f8fdd53d45a48b57 (patch) | |
tree | 32c00625190da49f11a0a274bed4f3bb7a6f118d /firmware/export | |
parent | 2187e815e20d8127df077ef02886867ff8dcaed4 (diff) | |
download | rockbox-79a2a936a289ed7dc6e997b6f8fdd53d45a48b57.tar.gz rockbox-79a2a936a289ed7dc6e997b6f8fdd53d45a48b57.zip |
remove numerical genre and use genre_string consistently:
- fix spurious display of "blues" genre for missing genre tag
- simplify code/use less code
- numerical->string conversion only once instead of at every use
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12552 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/id3.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/firmware/export/id3.h b/firmware/export/id3.h index 367854fdd1..d3d5dd35ce 100644 --- a/firmware/export/id3.h +++ b/firmware/export/id3.h | |||
@@ -153,7 +153,6 @@ struct mp3entry { | |||
153 | int layer; | 153 | int layer; |
154 | int year; | 154 | int year; |
155 | unsigned char id3version; | 155 | unsigned char id3version; |
156 | unsigned char genre; | ||
157 | unsigned int codectype; | 156 | unsigned int codectype; |
158 | unsigned int bitrate; | 157 | unsigned int bitrate; |
159 | unsigned long frequency; | 158 | unsigned long frequency; |
@@ -228,7 +227,7 @@ enum { | |||
228 | 227 | ||
229 | bool get_mp3_metadata(int fd, struct mp3entry *entry, const char *filename, bool v1first); | 228 | bool get_mp3_metadata(int fd, struct mp3entry *entry, const char *filename, bool v1first); |
230 | bool mp3info(struct mp3entry *entry, const char *filename, bool v1first); | 229 | bool mp3info(struct mp3entry *entry, const char *filename, bool v1first); |
231 | char* id3_get_genre(const struct mp3entry* id3); | 230 | char* id3_get_num_genre(const unsigned int genre_num); |
232 | char* id3_get_codec(const struct mp3entry* id3); | 231 | char* id3_get_codec(const struct mp3entry* id3); |
233 | int getid3v2len(int fd); | 232 | int getid3v2len(int fd); |
234 | void adjust_mp3entry(struct mp3entry *entry, void *dest, void *orig); | 233 | void adjust_mp3entry(struct mp3entry *entry, void *dest, void *orig); |