Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 514102 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 514102