Skip to content

Commit 7a63b0d

Browse files
KOPRajsgarbear
authored andcommitted
Remove translated strings from video shader configuration XML
1 parent 982ff5d commit 7a63b0d

File tree

2 files changed

+12
-22
lines changed

2 files changed

+12
-22
lines changed

xbmc/games/dialogs/osd/DialogGameVideoFilter.cpp

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -157,18 +157,14 @@ void CDialogGameVideoFilter::InitVideoFilters()
157157
if ((pathNode = pathNode->FirstChild()))
158158
videoFilter.path =
159159
URIUtils::AddFileToFolder(URIUtils::GetBasePath(xmlPath), pathNode->Value());
160-
TiXmlNode* nameIndexNode;
161-
if ((nameIndexNode = child->FirstChild("name")))
162-
if ((nameIndexNode = nameIndexNode->FirstChild()))
163-
videoFilter.nameIndex = atoi(nameIndexNode->Value());
164-
TiXmlNode* categoryIndexNode;
165-
if ((categoryIndexNode = child->FirstChild("category")))
166-
if ((categoryIndexNode = categoryIndexNode->FirstChild()))
167-
videoFilter.categoryIndex = atoi(categoryIndexNode->Value());
168-
TiXmlNode* descriptionNode;
169-
if ((descriptionNode = child->FirstChild("description")))
170-
if ((descriptionNode = descriptionNode->FirstChild()))
171-
videoFilter.descriptionIndex = atoi(descriptionNode->Value());
160+
TiXmlNode* nameNode;
161+
if ((nameNode = child->FirstChild("name")))
162+
if ((nameNode = nameNode->FirstChild()))
163+
videoFilter.name = nameNode->Value();
164+
TiXmlNode* folderNode;
165+
if ((folderNode = child->FirstChild("folder")))
166+
if ((folderNode = folderNode->FirstChild()))
167+
videoFilter.folder = folderNode->Value();
172168

173169
videoFilters.emplace_back(videoFilter);
174170
}
@@ -184,14 +180,9 @@ void CDialogGameVideoFilter::InitVideoFilters()
184180
if (!canLoadPreset)
185181
continue;
186182

187-
auto localizedName = GetLocalizedString(videoFilter.nameIndex);
188-
auto localizedCategory = GetLocalizedString(videoFilter.categoryIndex);
189-
auto localizedDescription = GetLocalizedString(videoFilter.descriptionIndex);
190-
191-
CFileItem item{localizedName};
192-
item.SetLabel2(localizedCategory);
183+
CFileItem item{videoFilter.name};
184+
item.SetLabel2(videoFilter.folder);
193185
item.SetProperty("game.videofilter", CVariant{videoFilter.path});
194-
item.SetProperty("game.videofilterdescription", CVariant{localizedDescription});
195186

196187
m_items.Add(std::move(item));
197188
}

xbmc/games/dialogs/osd/DialogGameVideoFilter.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ class CDialogGameVideoFilter : public CDialogGameVideoSelect
4949
struct VideoFilterProperties
5050
{
5151
std::string path;
52-
int nameIndex;
53-
int categoryIndex;
54-
int descriptionIndex;
52+
std::string name;
53+
std::string folder;
5554
};
5655

5756
//! \brief Set to true when a description has first been set

0 commit comments

Comments
 (0)