--- grip-3.3.1/src/id3.c.orig 2005-06-25 14:00:55.000000000 -0400 +++ grip-3.3.1/src/id3.c.orig 2014-06-20 22:49:34.781698351 -0400 @@ -31,11 +31,10 @@ /* this array contains string representations of all known ID3 tags */ /* taken from mp3id3 in the mp3tools 0.7 package */ ID3Genre id3_genres[] = { {"Alternative",20}, - {"Anime",146}, {"Blues",0}, {"Classical",32}, {"Country",2}, {"Folk",80}, {"Jazz",8}, @@ -43,31 +42,41 @@ {"Pop",13}, {"Rap",15}, {"Reggae",16}, {"Rock",17}, {"Other",12}, + {"Abstract",148}, {"Acapella",123}, - {"Acid",34}, {"Acid Jazz",74}, {"Acid Punk",73}, + {"Acid",34}, {"Acoustic",99}, {"AlternRock",40}, {"Ambient",26}, + {"Anime",145}, + {"Art Rock",149}, + {"Audio Theatre",184}, + {"Audiobook",183}, {"Avantgarde",90}, {"Ballad",116}, + {"Baroque",150}, {"Bass",41}, {"Beat",135}, {"Bebob",85}, + {"Bhangra",151}, {"Big Band",96}, + {"Big Beat",152}, {"Black Metal",138}, {"Bluegrass",89}, {"Booty Bass",107}, + {"Breakbeat",153}, {"BritPop",132}, {"Cabaret",65}, {"Celtic",88}, {"Chamber Music",104}, {"Chanson",102}, + {"Chillout",154}, {"Chorus",97}, {"Christian Gangsta Rap",136}, {"Christian Rap",61}, {"Christian Rock",141}, {"Classic Rock",1}, @@ -75,114 +84,149 @@ {"Club-House",128}, {"Comedy",57}, {"Contemporary Christian",140}, {"Crossover",139}, {"Cult",58}, - {"Dance",3}, {"Dance Hall",125}, + {"Dance",3}, {"Darkwave",50}, {"Death Metal",22}, {"Disco",4}, + {"Downtempo",155}, {"Dream",55}, {"Drum & Bass",127}, {"Drum Solo",122}, + {"Dub",156}, + {"Dubstep",189}, {"Duet",120}, + {"EBM",157}, {"Easy Listening",98}, + {"Eclectic",158}, + {"Electro",159}, + {"Electroclash",160}, {"Electronic",52}, + {"Emo",161}, {"Ethnic",48}, - {"Eurodance",54}, - {"Euro-house",124}, {"Euro-Techno",25}, + {"Euro-house",124}, + {"Eurodance",54}, + {"Experimental",162}, {"Fast Fusion",84}, - {"Folklore",115}, {"Folk/Rock",81}, + {"Folklore",115}, {"Freestyle",119}, {"Funk",5}, {"Fusion",30}, + {"G-Funk",188}, {"Game",36}, {"Gangsta",59}, + {"Garage",163}, + {"Garage Rock",190}, + {"Global",164}, {"Goa",126}, {"Gospel",38}, - {"Gothic",49}, {"Gothic Rock",91}, + {"Gothic",49}, {"Grunge",6}, - {"Hardcore",129}, {"Hard Rock",79}, + {"Hardcore",129}, {"Heavy Metal",137}, {"Hip-Hop",7}, {"House",35}, {"Humour",100}, + {"IDM",165}, + {"Illbient",166}, + {"Indie Rock",187}, {"Indie",131}, {"Industrial",19}, - {"Instrumental",33}, + {"Industro-Goth",167}, {"Instrumental Pop",46}, {"Instrumental Rock",47}, + {"Instrumental",33}, + {"JPop",146}, + {"Jam Band",168}, {"Jazz+Funk",29}, - {"JPop",145}, {"Jungle",63}, + {"Krautrock",169}, {"Latin",86}, + {"Leftfield",170}, {"Lo-Fi",71}, + {"Lounge",171}, + {"Math Rock",172}, {"Meditative",45}, {"Merengue",142}, {"Musical",77}, {"National Folk",82}, {"Native American",64}, {"Negerpunk",133}, + {"Neoclassical",182}, + {"Neue Deutsche Welle",185}, {"New Age",10}, + {"New Romantic",173}, {"New Wave",66}, {"Noise",39}, + {"Nu-Breakz",174}, {"Oldies",11}, {"Opera",103}, + {"Podcast",186}, {"Polka",75}, {"Polsk Punk",134}, {"Pop-Folk",53}, {"Pop/Funk",62}, {"Porn Groove",109}, + {"Post-Punk",175}, + {"Post-Rock",176}, {"Power Ballad",117}, {"Pranks",23}, {"Primus",108}, {"Progressive Rock",92}, + {"Psybient",191}, {"Psychadelic",67}, {"Psychedelic Rock",93}, - {"Punk",43}, + {"Psytrance",177}, {"Punk Rock",121}, - {"Rave",68}, + {"Punk",43}, {"R&B",14}, + {"Rave",68}, {"Retro",76}, {"Revival",87}, {"Rhythmic Soul",118}, {"Rock & Roll",78}, {"Salsa",143}, {"Samba",114}, {"Satire",110}, + {"Shoegaze",178}, {"Showtunes",69}, {"Ska",21}, {"Slow Jam",111}, {"Slow Rock",95}, {"Sonata",105}, {"Soul",42}, {"Sound Clip",37}, {"Soundtrack",24}, {"Southern Rock",56}, + {"Space Rock",179}, {"Space",44}, {"Speech",101}, {"Swing",83}, {"Symphonic Rock",94}, {"Symphony",106}, {"SynthPop",147}, {"Tango",113}, {"Techno",18}, {"Techno-Industrial",51}, {"Terror",130}, + {"Thrash Metal",144}, {"Top 40",60}, {"Trailer",70}, {"Trance",31}, - {"Trash Metal",144}, {"Tribal",72}, {"Trip-Hop",27}, + {"Trop Rock",180}, {"Vocal",28}, - {NULL,145} + {"World Music",181}, + {NULL,192} }; /* This array maps CDDB_ genre numbers to closest id3 genre */ int cddb_2_id3[] = {