diff options
| author | comex <comexk@gmail.com> | 2015-06-06 01:23:52 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2015-06-06 01:23:52 -0400 |
| commit | 95d682dfd5f0fbbe27f5d6a38da98f0535fa6845 (patch) | |
| tree | 5a84a12a3f5b284ebdddf3c4aa1f2a26ff22cb97 /Source/Core/DolphinWX/MainAndroid.cpp | |
| parent | 726fc58b49ef44a4477c43bd66cfaec2239411d9 (diff) | |
| parent | 0ed31181411a9aa98dc194c6179681e670f186cb (diff) | |
Merge pull request #2519 from JosJuice/volume-type-enum
Volume: Return volume type as an enum
Diffstat (limited to 'Source/Core/DolphinWX/MainAndroid.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/MainAndroid.cpp | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index 95b816c50b..07532be838 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -182,25 +182,17 @@ static int GetPlatform(std::string filename) if (pVolume != nullptr) { - bool is_wii_disc = pVolume->IsWiiDisc(); - bool is_wii_wad = pVolume->IsWadFile(); - - if (is_wii_disc) - { - __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a Wii disc."); - - // See Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/Game.java - return 1; - } - else if (is_wii_wad) - { - __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a Wii WAD."); - return 2; - } - else + switch (pVolume->GetVolumeType()) { - __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a Gamecube disc."); - return 0; + case DiscIO::IVolume::GAMECUBE_DISC: + __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a GameCube disc."); + return 0; + case DiscIO::IVolume::WII_DISC: + __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a Wii disc."); + return 1; + case DiscIO::IVolume::WII_WAD: + __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Volume is a Wii WAD."); + return 2; } } @@ -216,13 +208,9 @@ static std::string GetTitle(std::string filename) if (pVolume != nullptr) { std::map <DiscIO::IVolume::ELanguage, std::string> titles = pVolume->GetNames(); - - /*bool is_wii_title = IsWiiTitle(filename); - - DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage( - is_wii_title); - - + /* + bool is_wii_title = pVolume->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC; + DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(is_wii_title); auto it = titles.find(language); if (it != end) @@ -262,10 +250,8 @@ static std::string GetDescription(std::string filename) std::map <DiscIO::IVolume::ELanguage, std::string> descriptions = pVolume->GetDescriptions(); /* - bool is_wii_title = IsWiiTitle(filename); - - DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage( - is_wii_title); + bool is_wii_title = pVolume->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC; + DiscIO::IVolume::ELanguage language = SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(is_wii_title); auto it = descriptions.find(language); if (it != end) |