summaryrefslogtreecommitdiff
path: root/Source/Core/UICommon/GameFile.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2018-06-01 09:36:29 +0200
committerJosJuice <josjuice@gmail.com>2018-06-06 17:34:07 +0200
commit1c027bc148574cf0b05cd04f8ce15132e8115170 (patch)
treecf7d352f8cc68bc26b37168f86c8314d448903a7 /Source/Core/UICommon/GameFile.cpp
parentdaee5a4b43e95f50a1b024348a19d7f2bb48bdbc (diff)
Use UICommon's game list code on Android
Deduplicates code, and gets rid of some problems the old code had (such as: bad performance when calling native functions, only one disc showing up for multi-disc games, Wii banners being low-res, unnecessarily much effort being needed for adding more metadata).
Diffstat (limited to 'Source/Core/UICommon/GameFile.cpp')
-rw-r--r--Source/Core/UICommon/GameFile.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/UICommon/GameFile.cpp b/Source/Core/UICommon/GameFile.cpp
index 64d4740a0e..a666efdaa5 100644
--- a/Source/Core/UICommon/GameFile.cpp
+++ b/Source/Core/UICommon/GameFile.cpp
@@ -78,8 +78,15 @@ const std::string& GameFile::Lookup(DiscIO::Language language,
const std::string&
GameFile::LookupUsingConfigLanguage(const std::map<DiscIO::Language, std::string>& strings) const
{
+#ifdef ANDROID
+ // TODO: Make the Android app load the config at app start instead of emulation start
+ // so that we can access the user's preference here
+ const DiscIO::Language language = DiscIO::Language::English;
+#else
const bool wii = DiscIO::IsWii(m_platform);
- return Lookup(SConfig::GetInstance().GetCurrentLanguage(wii), strings);
+ const DiscIO::Language language = SConfig::GetInstance().GetCurrentLanguage(wii);
+#endif
+ return Lookup(language, strings);
}
GameFile::GameFile(const std::string& path)