vlc | branch: master | John Freed <[email protected]> | Thu Mar 29 22:52:47 2012 +0200| [bccd18f063e9002e137d8175a75a811c8ce2bbb9] | committer: Jean-Baptiste Kempf
add commonly used ID3 genres to the list See http://www.id3.org/Compliance_Issues and http://www.id3.org/id3v2.3.0 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bccd18f063e9002e137d8175a75a811c8ce2bbb9 --- modules/demux/mp4/id3genres.h | 104 ++++++++++++++++++++++++++++++++++------ 1 files changed, 88 insertions(+), 16 deletions(-) diff --git a/modules/demux/mp4/id3genres.h b/modules/demux/mp4/id3genres.h index 4f9d648..d3a9e51 100644 --- a/modules/demux/mp4/id3genres.h +++ b/modules/demux/mp4/id3genres.h @@ -6,6 +6,10 @@ * * Author: Sigmund Augdal Helberg <[email protected]> * list found at http://www.id3.org/id3v2.4.0-frames.txt + * Author: John Freed <[email protected]> + * updated with extensions to conform to real-world files + * see http://www.id3.org/Compliance_Issues and + * http://www.id3.org/id3v2.3.0 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,11 +26,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#define NUM_GENRES 80 +#define NUM_GENRES 148 static const char *ppsz_genres[] = { N_("Blues"), - N_("Classic rock"), + N_("Classic Rock"), N_("Country"), N_("Dance"), N_("Disco"), @@ -47,7 +51,7 @@ static const char *ppsz_genres[] = { N_("Industrial"), N_("Alternative"), N_("Ska"), - N_("Death metal"), + N_("Death Metal"), N_("Pranks"), N_("Soundtrack"), N_("Euro-Techno"), @@ -62,17 +66,17 @@ static const char *ppsz_genres[] = { N_("Acid"), N_("House"), N_("Game"), - N_("Sound clip"), + N_("Sound Clip"), N_("Gospel"), N_("Noise"), - N_("Alternative rock"), + N_("Alternative Rock"), N_("Bass"), N_("Soul"), N_("Punk"), N_("Space"), N_("Meditative"), - N_("Instrumental pop"), - N_("Instrumental rock"), + N_("Instrumental Pop"), + N_("Instrumental Rock"), N_("Ethnic"), N_("Gothic"), N_("Darkwave"), @@ -81,28 +85,96 @@ static const char *ppsz_genres[] = { N_("Pop-Folk"), N_("Eurodance"), N_("Dream"), - N_("Southern rock"), + N_("Southern Rock"), N_("Comedy"), N_("Cult"), N_("Gangsta"), N_("Top 40"), - N_("Christian rap"), - N_("Pop/funk"), + N_("Christian Rap"), + N_("Pop/Funk"), N_("Jungle"), N_("Native American"), N_("Cabaret"), - N_("New wave"), - N_("Psychedelic"), + N_("New Wave"), + N_("Psychadelic"), N_("Rave"), N_("Showtunes"), N_("Trailer"), N_("Lo-Fi"), N_("Tribal"), - N_("Acid punk"), - N_("Acid jazz"), + N_("Acid Punk"), + N_("Acid Jazz"), N_("Polka"), N_("Retro"), N_("Musical"), - N_("Rock & roll"), - N_("Hard rock") + N_("Rock & Roll"), + N_("Hard Rock"), + N_("Folk"), + N_("Folk-Rock"), + N_("National Folk"), + N_("Swing"), + N_("Fast Fusion"), + N_("Bebob"), + N_("Latin"), + N_("Revival"), + N_("Celtic"), + N_("Bluegrass"), + N_("Avantgarde"), + N_("Gothic Rock"), + N_("Progressive Rock"), + N_("Psychedelic Rock"), + N_("Symphonic Rock"), + N_("Slow Rock"), + N_("Big Band"), + N_("Chorus"), + N_("Easy Listening"), + N_("Acoustic"), + N_("Humour"), + N_("Speech"), + N_("Chanson"), + N_("Opera"), + N_("Chamber Music"), + N_("Sonata"), + N_("Symphony"), + N_("Booty Bass"), + N_("Primus"), + N_("Porn Groove"), + N_("Satire"), + N_("Slow Jam"), + N_("Club"), + N_("Tango"), + N_("Samba"), + N_("Folklore"), + N_("Ballad"), + N_("Power Ballad"), + N_("Rhythmic Soul"), + N_("Freestyle"), + N_("Duet"), + N_("Punk Rock"), + N_("Drum Solo"), + N_("Acapella"), + N_("Euro-House"), + N_("Dance Hall"), + N_("Goa"), + N_("Drum & Bass"), + N_("Club - House"), + N_("Hardcore"), + N_("Terror"), + N_("Indie"), + N_("BritPop"), + N_("Negerpunk"), + N_("Polsk Punk"), + N_("Beat"), + N_("Christian Gangsta Rap"), + N_("Heavy Metal"), + N_("Black Metal"), + N_("Crossover"), + N_("Contemporary Christian"), + N_("Christian Rock"), + N_("Merengue"), + N_("Salsa"), + N_("Thrash Metal"), + N_("Anime"), + N_("JPop"), + N_("Synthpop") }; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
