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

1 files changed, 1 insertions, 2 deletions

diff --git a/firmware/export/id3.h b/firmware/export/id3.h
index 367854f..d3d5dd3 100644
--- a/firmware/export/id3.h
+++ b/firmware/export/id3.h
@@ -153,7 +153,6 @@ struct mp3entry {
     int layer;
     int year;
     unsigned char id3version;
-    unsigned char genre;
     unsigned int codectype;
     unsigned int bitrate;
     unsigned long frequency;
@@ -228,7 +227,7 @@ enum {
 
 bool get_mp3_metadata(int fd, struct mp3entry *entry, const char *filename, bool v1first);
 bool mp3info(struct mp3entry *entry, const char *filename, bool v1first);
-char* id3_get_genre(const struct mp3entry* id3);
+char* id3_get_num_genre(const unsigned int genre_num);
 char* id3_get_codec(const struct mp3entry* id3);
 int getid3v2len(int fd);
 void adjust_mp3entry(struct mp3entry *entry, void *dest, void *orig);