[OpenNeo-CVS] openneo/apps wps-display.c,1.15,1.16

[Francois B <mrs...@us...>]

Update of /cvsroot/openneo/openneo/apps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2485

Modified Files:
	wps-display.c 
Log Message:
Removed genre stuff

Index: wps-display.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/wps-display.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wps-display.c	18 May 2004 04:26:46 -0000	1.15
--- wps-display.c	19 May 2004 01:39:46 -0000	1.16
***************
*** 57,60 ****
--- 57,61 ----
  #include "units.h"
  #include "volume.h"
+ #include "genre.h"
  
  #define WPS_CONFIG OPENNEO_DIR "/default.wps"
***************
*** 91,127 ****
  static bool wps_loaded = false;
  
- static const char* const genres[] = {
-     "Blues", "Classic Rock", "Country", "Dance", "Disco", "Funk", "Grunge",
-     "Hip-Hop", "Jazz", "Metal", "New Age", "Oldies", "Other", "Pop", "R&B",
-     "Rap", "Reggae", "Rock", "Techno", "Industrial", "Alternative", "Ska",
-     "Death Metal", "Pranks", "Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop",
-     "Vocal", "Jazz+Funk", "Fusion", "Trance", "Classical", "Instrumental",
-     "Acid", "House", "Game", "Sound Clip", "Gospel", "Noise", "AlternRock",
-     "Bass", "Soul", "Punk", "Space", "Meditative", "Instrumental Pop",
-     "Instrumental Rock", "Ethnic", "Gothic", "Darkwave", "Techno-Industrial",
-     "Electronic", "Pop-Folk", "Eurodance", "Dream", "Southern Rock", "Comedy",
-     "Cult", "Gangsta", "Top 40", "Christian Rap", "Pop/Funk", "Jungle",
-     "Native American", "Cabaret", "New Wave", "Psychadelic", "Rave",
-     "Showtunes", "Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz",
-     "Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock",
- 
-     /* winamp extensions */
-     "Folk", "Folk-Rock", "National Folk", "Swing", "Fast Fusion", "Bebob",
-     "Latin", "Revival", "Celtic", "Bluegrass", "Avantgarde", "Gothic Rock",
-     "Progressive Rock", "Psychedelic Rock", "Symphonic Rock", "Slow Rock",
-     "Big Band", "Chorus", "Easy Listening", "Acoustic", "Humour", "Speech",
-     "Chanson", "Opera", "Chamber Music", "Sonata", "Symphony", "Booty Bass",
-     "Primus", "Porn Groove", "Satire", "Slow Jam", "Club", "Tango", "Samba",
-     "Folklore", "Ballad", "Power Ballad", "Rhythmic Soul", "Freestyle",
-     "Duet", "Punk Rock", "Drum Solo", "A capella", "Euro-House", "Dance Hall"
- };
- 
- char* wps_get_genre(unsigned int genre)
- {
-     if (genre < sizeof(genres)/sizeof(char*))
-         return (char*)genres[genre];
-     return NULL;
- }
- 
  /* Set format string to use for WPS, splitting it into lines */
  static void wps_format(char* fmt)
--- 92,95 ----
***************
*** 366,372 ****
                          return id3->genre_string ;
  
!                     if (id3->genre < sizeof(genres)/sizeof(char*))
!                         return (char*)genres[id3->genre];
!                     return NULL;
  
                  case 'v': /* id3 version */
--- 334,338 ----
                          return id3->genre_string ;
  
! 		    return genre_gets( id3->genre );
  
                  case 'v': /* id3 version */