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/ISOFile.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/ISOFile.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ISOFile.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 03af39813f..a1f9187f64 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -82,10 +82,7 @@ GameListItem::GameListItem(const std::string& _rFileName) if (pVolume != nullptr) { - if (!pVolume->IsWadFile()) - m_Platform = pVolume->IsWiiDisc() ? WII_DISC : GAMECUBE_DISC; - else - m_Platform = WII_WAD; + m_Platform = pVolume->GetVolumeType(); m_names = pVolume->GetNames(); m_descriptions = pVolume->GetDescriptions(); @@ -217,7 +214,8 @@ std::string GameListItem::GetDescription(DiscIO::IVolume::ELanguage language) co std::string GameListItem::GetDescription() const { - return GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(m_Platform != GAMECUBE_DISC)); + bool wii = m_Platform != DiscIO::IVolume::GAMECUBE_DISC; + return GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(wii)); } std::string GameListItem::GetName(DiscIO::IVolume::ELanguage language) const @@ -227,7 +225,8 @@ std::string GameListItem::GetName(DiscIO::IVolume::ELanguage language) const std::string GameListItem::GetName() const { - std::string name = GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(m_Platform != GAMECUBE_DISC)); + bool wii = m_Platform != DiscIO::IVolume::GAMECUBE_DISC; + std::string name = GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(wii)); if (name.empty()) { // No usable name, return filename (better than nothing) @@ -252,7 +251,7 @@ const std::string GameListItem::GetWiiFSPath() const if (iso == nullptr) return ret; - if (iso->IsWiiDisc() || iso->IsWadFile()) + if (iso->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC) { u64 title = 0; |