Skip to content

Commit 4c8c18b

Browse files
author
NekoBit
authored
Update tags and fix auto abuse
The link referring to audacity forums is now invalid, so it's best removed, and we keep the original term for clarification purposes ("Offensive" might appear to be wrong to some people, the correct value should be returned here)
1 parent 5c1b612 commit 4c8c18b

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

src/Tags.cpp

+6-9
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,8 @@ static const wxChar *DefaultGenres[] =
203203
wxT("Hardcore"),
204204
wxT("Terror"),
205205
wxT("Indie"),
206-
wxT("BritPop"),
207-
208-
// Standard name is offensive (see "http://www.audacityteam.org/forum/viewtopic.php?f=11&t=3924").
209-
wxT("Offensive"), // wxT("Negerpunk"),
210-
206+
wxT("Britpop"),
207+
wxT("Negerpunk"),
211208
wxT("Polsk Punk"),
212209
wxT("Beat"),
213210
wxT("Christian Gangsta Rap"),
@@ -220,7 +217,7 @@ static const wxChar *DefaultGenres[] =
220217
wxT("Salsa"),
221218
wxT("Thrash Metal"),
222219
wxT("Anime"),
223-
wxT("JPop"),
220+
wxT("J-Pop"),
224221
wxT("Synthpop")
225222
};
226223

@@ -1108,10 +1105,10 @@ void TagsEditorDialog::OnChange(wxGridEvent & event)
11081105

11091106
// Do not permit duplication of any of the tags.
11101107
// Tags differing only in case are nondistinct.
1111-
auto row = event.GetRow();
1108+
int row = event.GetRow();
11121109
const wxString key0 = mGrid->GetCellValue(row, 0).Upper();
1113-
auto nn = mGrid->GetNumberRows();
1114-
for (decltype(nn) ii = 0; ii < nn; ++ii) {
1110+
int nn = mGrid->GetNumberRows();
1111+
for (int ii = 0; ii < nn; ++ii) {
11151112
if (ii == row)
11161113
continue;
11171114
auto key = mGrid->GetCellValue(ii, 0).Upper();

0 commit comments

Comments
 (0)