diff options
| author | JosJuice <josjuice@gmail.com> | 2018-03-31 14:04:13 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2018-03-31 14:11:32 +0200 |
| commit | 4387432436c072944d7ee3e2554ac1cbad024441 (patch) | |
| tree | eefa62cd207ccb0d63aaadee877b00a0f4490190 /Source/Android/jni/MainAndroid.cpp | |
| parent | c3398c9e2c1c5072b0570d8b6f277a6c127370d1 (diff) | |
DiscIO: Don't use all uppercase for enum values
Also removing some prefixes that we don't need now that we're
using enum classes instead of plain enums.
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 404ce93e3a..cafd87979a 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -253,13 +253,13 @@ static int GetPlatform(std::string filename) { switch (pVolume->GetVolumeType()) { - case DiscIO::Platform::GAMECUBE_DISC: + case DiscIO::Platform::GameCubeDisc: __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a GameCube disc."); return 0; - case DiscIO::Platform::WII_DISC: + case DiscIO::Platform::WiiDisc: __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a Wii disc."); return 1; - case DiscIO::Platform::WII_WAD: + case DiscIO::Platform::WiiWAD: __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a Wii WAD."); return 2; } @@ -282,7 +282,7 @@ static std::string GetTitle(std::string filename) titles = pVolume->GetShortNames(); /* - bool is_wii_title = pVolume->GetVolumeType() != DiscIO::Platform::GAMECUBE_DISC; + const bool is_wii_title = DiscIO::IsWii(pVolume->GetVolumeType()); DiscIO::Language language = SConfig::GetInstance().GetCurrentLanguage(is_wii_title); auto it = titles.find(language); @@ -292,8 +292,8 @@ static std::string GetTitle(std::string filename) auto end = titles.end(); // English tends to be a good fallback when the requested language isn't available - // if (language != DiscIO::Language::LANGUAGE_ENGLISH) { - auto it = titles.find(DiscIO::Language::LANGUAGE_ENGLISH); + // if (language != DiscIO::Language::English) { + auto it = titles.find(DiscIO::Language::English); if (it != end) return it->second; //} @@ -323,7 +323,7 @@ static std::string GetDescription(std::string filename) std::map<DiscIO::Language, std::string> descriptions = volume->GetDescriptions(); /* - bool is_wii_title = pVolume->GetVolumeType() != DiscIO::Platform::GAMECUBE_DISC; + const bool is_wii_title = DiscIO::IsWii(pVolume->GetVolumeType()); DiscIO::Language language = SConfig::GetInstance().GetCurrentLanguage(is_wii_title); auto it = descriptions.find(language); @@ -333,8 +333,8 @@ static std::string GetDescription(std::string filename) auto end = descriptions.end(); // English tends to be a good fallback when the requested language isn't available - // if (language != DiscIO::Language::LANGUAGE_ENGLISH) { - auto it = descriptions.find(DiscIO::Language::LANGUAGE_ENGLISH); + // if (language != DiscIO::Language::English) { + auto it = descriptions.find(DiscIO::Language::English); if (it != end) return it->second; //} |