diff options
author | Björn Stenberg <bjorn@haxx.se> | 2004-05-22 01:38:41 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2004-05-22 01:38:41 +0000 |
commit | bdaf5884caa72457fd2602ea7a1f220d3bd18298 (patch) | |
tree | 53ac59923918941119a4e3f8927aef08872ec4b3 /apps/wps-display.c | |
parent | 1c6ba0adacf88f23ef81961ffcc7db14d6428159 (diff) | |
download | rockbox-bdaf5884caa72457fd2602ea7a1f220d3bd18298.tar.gz rockbox-bdaf5884caa72457fd2602ea7a1f220d3bd18298.zip |
Moved genre list and access function to id3.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4692 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/wps-display.c')
-rw-r--r-- | apps/wps-display.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/apps/wps-display.c b/apps/wps-display.c index 8cbf7db75e..44955d0543 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c | |||
@@ -85,42 +85,6 @@ static int ff_rewind_count; | |||
85 | bool wps_time_countup = true; | 85 | bool wps_time_countup = true; |
86 | static bool wps_loaded = false; | 86 | static bool wps_loaded = false; |
87 | 87 | ||
88 | static const char* const genres[] = { | ||
89 | "Blues", "Classic Rock", "Country", "Dance", "Disco", "Funk", "Grunge", | ||
90 | "Hip-Hop", "Jazz", "Metal", "New Age", "Oldies", "Other", "Pop", "R&B", | ||
91 | "Rap", "Reggae", "Rock", "Techno", "Industrial", "Alternative", "Ska", | ||
92 | "Death Metal", "Pranks", "Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop", | ||
93 | "Vocal", "Jazz+Funk", "Fusion", "Trance", "Classical", "Instrumental", | ||
94 | "Acid", "House", "Game", "Sound Clip", "Gospel", "Noise", "AlternRock", | ||
95 | "Bass", "Soul", "Punk", "Space", "Meditative", "Instrumental Pop", | ||
96 | "Instrumental Rock", "Ethnic", "Gothic", "Darkwave", "Techno-Industrial", | ||
97 | "Electronic", "Pop-Folk", "Eurodance", "Dream", "Southern Rock", "Comedy", | ||
98 | "Cult", "Gangsta", "Top 40", "Christian Rap", "Pop/Funk", "Jungle", | ||
99 | "Native American", "Cabaret", "New Wave", "Psychadelic", "Rave", | ||
100 | "Showtunes", "Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz", | ||
101 | "Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock", | ||
102 | |||
103 | /* winamp extensions */ | ||
104 | "Folk", "Folk-Rock", "National Folk", "Swing", "Fast Fusion", "Bebob", | ||
105 | "Latin", "Revival", "Celtic", "Bluegrass", "Avantgarde", "Gothic Rock", | ||
106 | "Progressive Rock", "Psychedelic Rock", "Symphonic Rock", "Slow Rock", | ||
107 | "Big Band", "Chorus", "Easy Listening", "Acoustic", "Humour", "Speech", | ||
108 | "Chanson", "Opera", "Chamber Music", "Sonata", "Symphony", "Booty Bass", | ||
109 | "Primus", "Porn Groove", "Satire", "Slow Jam", "Club", "Tango", "Samba", | ||
110 | "Folklore", "Ballad", "Power Ballad", "Rhythmic Soul", "Freestyle", | ||
111 | "Duet", "Punk Rock", "Drum Solo", "A capella", "Euro-House", "Dance Hall" | ||
112 | }; | ||
113 | |||
114 | char* wps_get_genre(struct mp3entry* id3) | ||
115 | { | ||
116 | if( id3->genre_string ) | ||
117 | return id3->genre_string ; | ||
118 | |||
119 | if (id3->genre < sizeof(genres)/sizeof(char*)) | ||
120 | return (char*)genres[id3->genre]; | ||
121 | return NULL; | ||
122 | } | ||
123 | |||
124 | /* Set format string to use for WPS, splitting it into lines */ | 88 | /* Set format string to use for WPS, splitting it into lines */ |
125 | static void wps_format(char* fmt) | 89 | static void wps_format(char* fmt) |
126 | { | 90 | { |
@@ -396,7 +360,7 @@ static char* get_tag(struct mp3entry* cid3, | |||
396 | return NULL; | 360 | return NULL; |
397 | 361 | ||
398 | case 'g': /* genre */ | 362 | case 'g': /* genre */ |
399 | return wps_get_genre(id3); | 363 | return id3_get_genre(id3); |
400 | 364 | ||
401 | case 'v': /* id3 version */ | 365 | case 'v': /* id3 version */ |
402 | switch (id3->id3version) { | 366 | switch (id3->id3version) { |