From ace060748b572063b33acee13c19000783a6cdde Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 17 Jan 2015 13:21:02 +0100 Subject: Don't read from disk when checking volume type Should be faster than relying on the OS to cache the magic words. Also gets rid of the odd recursive call in VolumeDirectory. --- Source/Core/DolphinWX/ISOFile.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/Core/DolphinWX/ISOFile.cpp') diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 8d61d9f4d4..8d25e24d29 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -62,14 +62,14 @@ GameListItem::GameListItem(const std::string& _rFileName) if (pVolume != nullptr) { - if (!DiscIO::IsVolumeWadFile(pVolume)) - m_Platform = DiscIO::IsVolumeWiiDisc(pVolume) ? WII_DISC : GAMECUBE_DISC; + if (!pVolume->IsWadFile()) + m_Platform = pVolume->IsWiiDisc() ? WII_DISC : GAMECUBE_DISC; else m_Platform = WII_WAD; m_volume_names = pVolume->GetNames(); - m_Country = pVolume->GetCountry(); + m_Country = pVolume->GetCountry(); m_FileSize = pVolume->GetRawSize(); m_VolumeSize = pVolume->GetSize(); @@ -281,7 +281,7 @@ const std::string GameListItem::GetWiiFSPath() const if (iso == nullptr) return ret; - if (DiscIO::IsVolumeWiiDisc(iso) || DiscIO::IsVolumeWadFile(iso)) + if (iso->IsWiiDisc() || iso->IsWadFile()) { u64 title = 0; -- cgit v1.2.3