diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2016-07-13 19:51:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 19:51:01 +0200 |
| commit | 014037ebb7897bd7051bdd9b76128fbc20db1674 (patch) | |
| tree | 2a47fb496d72d5c72413b6433afc4006fdc4aa02 /Source/Core/DiscIO/VolumeDirectory.cpp | |
| parent | 89a03174ccfcc0dc80c9f59b84338f508919a555 (diff) | |
| parent | 0a15aaaa123482ecf7b2490a13e33a884416d51c (diff) | |
Merge pull request #3983 from JosJuice/discio-enums
Move DiscIO enums to a new file
Diffstat (limited to 'Source/Core/DiscIO/VolumeDirectory.cpp')
| -rw-r--r-- | Source/Core/DiscIO/VolumeDirectory.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index beff1ca936..f37bfb44aa 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -17,6 +17,7 @@ #include "Common/Logging/Log.h" #include "Common/MathUtil.h" #include "DiscIO/Blob.h" +#include "DiscIO/Enums.h" #include "DiscIO/FileMonitor.h" #include "DiscIO/Volume.h" #include "DiscIO/VolumeDirectory.h" @@ -163,7 +164,7 @@ void CVolumeDirectory::SetUniqueID(const std::string& id) memcpy(m_diskHeader.data(), id.c_str(), std::min(id.length(), MAX_ID_LENGTH)); } -IVolume::ECountry CVolumeDirectory::GetCountry() const +Country CVolumeDirectory::GetCountry() const { return CountrySwitch(m_diskHeader[3]); } @@ -183,12 +184,12 @@ std::string CVolumeDirectory::GetInternalName() const return ""; } -std::map<IVolume::ELanguage, std::string> CVolumeDirectory::GetLongNames() const +std::map<Language, std::string> CVolumeDirectory::GetLongNames() const { std::string name = GetInternalName(); if (name.empty()) return {{}}; - return {{IVolume::LANGUAGE_UNKNOWN, name}}; + return {{Language::LANGUAGE_UNKNOWN, name}}; } std::vector<u32> CVolumeDirectory::GetBanner(int* width, int* height) const @@ -218,9 +219,9 @@ std::string CVolumeDirectory::GetApploaderDate() const return "VOID"; } -IVolume::EPlatform CVolumeDirectory::GetVolumeType() const +Platform CVolumeDirectory::GetVolumeType() const { - return m_is_wii ? WII_DISC : GAMECUBE_DISC; + return m_is_wii ? Platform::WII_DISC : Platform::GAMECUBE_DISC; } BlobType CVolumeDirectory::GetBlobType() const |