Permalink
Browse files

Fix Thrash Metal genre name

When I originally wrote the first library, I must have picked
up a typo from an existing list.  Since all other libraries
just used the same genre list, this typo was never caught.
  • Loading branch information...
1 parent abcfd4f commit a06daf430a31e834486f7cd9eff7ab4fa688455a @jeremyevans committed Jul 9, 2012
Showing with 9 additions and 9 deletions.
  1. +1 −1 c/apetag.c
  2. +1 −1 c/test/test_apetag.c
  3. +1 −1 clojure/apetag.clj
  4. +1 −1 erlang/apetag.hrl
  5. +1 −1 haskell/ApeTag.hs
  6. +1 −1 lua/apetag.lua
  7. +1 −1 perl/lib/ApeTag.pm
  8. +1 −1 python/ApeTag.py
  9. +1 −1 ruby/apetag.rb
View
@@ -1493,7 +1493,7 @@ static int ApeTag__load_ID3_GENRES(struct ApeTag *tag) {
ADD_TO_ID3_GENRES("Christian Rock", "\215");
ADD_TO_ID3_GENRES("Merengue", "\216");
ADD_TO_ID3_GENRES("Salsa", "\217");
- ADD_TO_ID3_GENRES("Trash Meta", "\220");
+ ADD_TO_ID3_GENRES("Thrash Metal", "\220");
ADD_TO_ID3_GENRES("Anime", "\221");
ADD_TO_ID3_GENRES("Jpop", "\222");
ADD_TO_ID3_GENRES("Synthpop", "\223");
View
@@ -1068,7 +1068,7 @@ int test_ApeTag__lookup_genre(void) {
LOOKUP_GENRE("Christian Rock", 14, '\215');
LOOKUP_GENRE("Merengue", 8, '\216');
LOOKUP_GENRE("Salsa", 5, '\217');
- LOOKUP_GENRE("Trash Meta", 10, '\220');
+ LOOKUP_GENRE("Thrash Metal", 10, '\220');
LOOKUP_GENRE("Anime", 5, '\221');
LOOKUP_GENRE("Jpop", 4, '\222');
LOOKUP_GENRE("Synthpop", 8, '\223');
View
@@ -39,7 +39,7 @@
"Goa", "Drum & Bass", "Club-House", "Hardcore", "Terror", "Indie", "BritPop", "Negerpunk",
"Polsk Punk", "Beat", "Christian Gangsta Rap", "Heavy Metal", "Black Metal",
"Crossover", "Contemporary Christian", "Christian Rock", "Merengue", "Salsa",
- "Trash Meta", "Anime", "Jpop", "Synthpop"])
+ "Thrash Metal", "Anime", "Jpop", "Synthpop"])
(def ID3-GENRES-HASH ((reduce (fn [m g] {:number (+ 1 (m :number)), :hash (assoc (m :hash) (.toLowerCase g) (m :number))}) {:number 0, :hash {}} ID3-GENRES) :hash))
(defn- with-file-channel [filename options f]
View
@@ -21,6 +21,6 @@
"Goa", "Drum & Bass", "Club-House", "Hardcore", "Terror", "Indie", "BritPop", "Negerpunk",
"Polsk Punk", "Beat", "Christian Gangsta Rap", "Heavy Metal", "Black Metal",
"Crossover", "Contemporary Christian", "Christian Rock", "Merengue", "Salsa",
- "Trash Meta", "Anime", "Jpop", "Synthpop"]).
+ "Thrash Metal", "Anime", "Jpop", "Synthpop"]).
-record(apetag, {filename, file = nil, check_id3 = true, has_tag = nil, file_size = nil, tag_start = nil, tag_size = nil, tag_item_count = nil, tag_header = nil, tag_data = nil, tag_footer = nil, id3 = nil, fields = nil}).
-record(apeitem, {key, values, flags, lowercase_key}).
View
@@ -94,7 +94,7 @@ _buildID3Genres _ [] a = a
_buildID3Genres i (s:ss) a = _buildID3Genres (i + 1) ss $ Map.insert s i a
buildID3Genres ss = _buildID3Genres 0 ss Map.empty
-id3Genres = buildID3Genres ["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", "Prank", "Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop", "Vocal", "Jazz + Funk", "Fusion", "Trance", "Classical", "Instrumental", "Acid", "House", "Game", "Sound Clip", "Gospel", "Noise", "Alternative Rock", "Bass", "Soul", "Punk", "Space", "Meditative", "Instrumental Pop", "Instrumental Rock", "Ethnic", "Gothic", "Darkwave", "Techno-Industrial", "Electronic", "Pop-Fol", "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta", "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native US", "Cabaret", "New Wave", "Psychadelic", "Rave", "Showtunes", "Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock", "Folk", "Folk-Rock", "National Folk", "Swing", "Fast Fusion", "Bebop", "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", "Rhytmic Soul", "Freestyle", "Duet", "Punk Rock", "Drum Solo", "Acapella", "Euro-House", "Dance Hall", "Goa", "Drum & Bass", "Club-House", "Hardcore", "Terror", "Indie", "BritPop", "Negerpunk", "Polsk Punk", "Beat", "Christian Gangsta Rap", "Heavy Metal", "Black Metal", "Crossover", "Contemporary Christian", "Christian Rock", "Merengue", "Salsa", "Trash Meta", "Anime", "Jpop", "Synthpop"]
+id3Genres = buildID3Genres ["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", "Prank", "Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop", "Vocal", "Jazz + Funk", "Fusion", "Trance", "Classical", "Instrumental", "Acid", "House", "Game", "Sound Clip", "Gospel", "Noise", "Alternative Rock", "Bass", "Soul", "Punk", "Space", "Meditative", "Instrumental Pop", "Instrumental Rock", "Ethnic", "Gothic", "Darkwave", "Techno-Industrial", "Electronic", "Pop-Fol", "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta", "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native US", "Cabaret", "New Wave", "Psychadelic", "Rave", "Showtunes", "Trailer", "Lo-Fi", "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock", "Folk", "Folk-Rock", "National Folk", "Swing", "Fast Fusion", "Bebop", "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", "Rhytmic Soul", "Freestyle", "Duet", "Punk Rock", "Drum Solo", "Acapella", "Euro-House", "Dance Hall", "Goa", "Drum & Bass", "Club-House", "Hardcore", "Terror", "Indie", "BritPop", "Negerpunk", "Polsk Punk", "Beat", "Christian Gangsta Rap", "Heavy Metal", "Black Metal", "Crossover", "Contemporary Christian", "Christian Rock", "Merengue", "Salsa", "Thrash Metal", "Anime", "Jpop", "Synthpop"]
apePreamble = "APETAGEX\208\7\0\0"
apeHeaderFlags = "\0\0\160"
View
@@ -286,7 +286,7 @@ ApeTag = {
'Goa', 'Drum & Bass', 'Club-House', 'Hardcore', 'Terror', 'Indie', 'BritPop', 'Negerpunk',
'Polsk Punk', 'Beat', 'Christian Gangsta Rap', 'Heavy Metal', 'Black Metal',
'Crossover', 'Contemporary Christian', 'Christian Rock', 'Merengue', 'Salsa',
- 'Trash Meta', 'Anime', 'Jpop', 'Synthpop'},
+ 'Thrash Metal', 'Anime', 'Jpop', 'Synthpop'},
ID3_GENRES_HASH = {},
YEAR_RE = '%d%d%d%d',
MP3_RE = '%.mp3$',
View
@@ -35,7 +35,7 @@ my @ID3G = (
"Goa", "Drum & Bass", "Club-House", "Hardcore", "Terror", "Indie", "BritPop", "Negerpunk",
"Polsk Punk", "Beat", "Christian Gangsta Rap", "Heavy Metal", "Black Metal",
"Crossover", "Contemporary Christian", "Christian Rock", "Merengue", "Salsa",
-"Trash Meta", "Anime", "Jpop", "Synthpop");
+"Thrash Metal", "Anime", "Jpop", "Synthpop");
my %ID3_GENRES_HASH;
for (my $i = 0; $i < scalar(@ID3G); $i++) {
View
@@ -144,7 +144,7 @@
Goa, Drum & Bass, Club-House, Hardcore, Terror, Indie, BritPop, Negerpunk,
Polsk Punk, Beat, Christian Gangsta Rap, Heavy Metal, Black Metal,
Crossover, Contemporary Christian, Christian Rock, Merengue, Salsa,
- Trash Meta, Anime, Jpop, Synthpop'''
+ Thrash Metal, Anime, Jpop, Synthpop'''
_apeitemkeys = '''Title, Artist, Album, Year, Comment, Genre, Track,
Debut Album, Subtitle, Publisher, Conductor, Composer, Copyright,
Publicationright, File, EAN/UPC, ISBN, Catalog, LC, Record Date,
View
@@ -242,7 +242,7 @@ class ApeTag
Goa, Drum & Bass, Club-House, Hardcore, Terror, Indie, BritPop, Negerpunk,
Polsk Punk, Beat, Christian Gangsta Rap, Heavy Metal, Black Metal,
Crossover, Contemporary Christian, Christian Rock, Merengue, Salsa,
- Trash Meta, Anime, Jpop, Synthpop'.split(',').collect{|g| g.strip}
+ Thrash Metal, Anime, Jpop, Synthpop'.split(',').collect{|g| g.strip}
ID3_GENRES_HASH = CICPHash.new(255.chr)
ID3_GENRES.each_with_index{|g,i| ID3_GENRES_HASH[g] = i.chr }
FILE_OBJ_METHODS = %w'close seek read pos write truncate'

0 comments on commit a06daf4

Please sign in to comment.