From 0ed31181411a9aa98dc194c6179681e670f186cb Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 4 Jun 2015 16:26:36 +0200 Subject: Volume: Return volume type as an enum ISOFile and GameFile were using IsWiiDisc() and IsWadFile() to set an enum value. The volume might as well return an enum directly. I increased the Qt CACHE_REVISION because m_platform now is saved as u32 instead of int, but increasing the wx CACHE_REVISION is not necessary. --- Source/Core/DiscIO/VolumeDirectory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DiscIO/VolumeDirectory.cpp') diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index b7fe30aed5..77f4523417 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -220,9 +220,9 @@ std::string CVolumeDirectory::GetApploaderDate() const return "VOID"; } -bool CVolumeDirectory::IsWiiDisc() const +IVolume::EPlatform CVolumeDirectory::GetVolumeType() const { - return m_is_wii; + return m_is_wii ? WII_DISC : GAMECUBE_DISC; } u64 CVolumeDirectory::GetSize() const -- cgit v1.2.3