piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Volume: Return volume type as an enum

Browse Source 
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.
This commit is contained in:
JosJuice
2015-06-04 16:26:36 +02:00
parent f5b0468179
commit 0ed3118141
21 changed files with 98 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/DolphinQt/GameList/GameFile.cpp
View File

@ -25,7 +25,7 @@
#include "DolphinQt/Utils/Resources.h"
#include "DolphinQt/Utils/Utils.h"
static const u32 CACHE_REVISION = 0x008;
static const u32 CACHE_REVISION = 0x009;
static const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2
static QMap<DiscIO::IVolume::ELanguage, QString> ConvertLocalizedStrings(std::map<DiscIO::IVolume::ELanguage, std::string> strings)
@ -85,10 +85,7 @@ GameFile::GameFile(const QString& fileName)
if (volume != nullptr)
{
if (!volume->IsWadFile())
m_platform = volume->IsWiiDisc() ? WII_DISC : GAMECUBE_DISC;
else
m_platform = WII_WAD;
m_platform = volume->GetVolumeType();
m_names = ConvertLocalizedStrings(volume->GetNames());
m_descriptions = ConvertLocalizedStrings(volume->GetDescriptions());
@ -167,6 +164,7 @@ bool GameFile::LoadFromCache()
return false;
u32 country;
u32 platform;
QMap<u8, QString> names;
QMap<u8, QString> descriptions;
stream >> m_folder_name
@ -179,10 +177,11 @@ bool GameFile::LoadFromCache()
>> country
>> m_banner
>> m_compressed
>> m_platform
>> platform
>> m_disc_number
>> m_revision;
m_country = (DiscIO::IVolume::ECountry)country;
m_platform = (DiscIO::IVolume::EPlatform)platform;
m_names = CastLocalizedStrings<DiscIO::IVolume::ELanguage>(names);
m_descriptions = CastLocalizedStrings<DiscIO::IVolume::ELanguage>(descriptions);
file.close();
@ -219,7 +218,7 @@ void GameFile::SaveToCache()
<< (u32)m_country
<< m_banner
<< m_compressed
<< m_platform
<< (u32)m_platform
<< m_disc_number
<< m_revision;
}
@ -255,7 +254,8 @@ QString GameFile::GetDescription(DiscIO::IVolume::ELanguage language) const
QString GameFile::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));
}
QString GameFile::GetName(DiscIO::IVolume::ELanguage language) const
@ -265,7 +265,8 @@ QString GameFile::GetName(DiscIO::IVolume::ELanguage language) const
QString GameFile::GetName() const
{
QString name = GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(m_platform != GAMECUBE_DISC));
bool wii = m_platform != DiscIO::IVolume::GAMECUBE_DISC;
QString name = GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.GetCurrentLanguage(wii));
if (name.isEmpty())
{
// No usable name, return filename (better than nothing)
@ -284,7 +285,7 @@ const QString GameFile::GetWiiFSPath() const
if (volume == nullptr)
return ret;
if (volume->IsWiiDisc() || volume->IsWadFile())
if (volume->GetVolumeType() != DiscIO::IVolume::GAMECUBE_DISC)
{
std::string path;
u64 title;

12
Source/Core/DolphinQt/GameList/GameFile.h
View File

@ -31,7 +31,7 @@ public:
const QString GetUniqueID() const { return m_unique_id; }
const QString GetWiiFSPath() const;
DiscIO::IVolume::ECountry GetCountry() const { return m_country; }
int GetPlatform() const { return m_platform; }
DiscIO::IVolume::EPlatform GetPlatform() const { return m_platform; }
const QString GetIssues() const { return m_issues; }
int GetEmuState() const { return m_emu_state; }
bool IsCompressed() const { return m_compressed; }
@ -41,14 +41,6 @@ public:
u8 GetDiscNumber() const { return m_disc_number; }
const QPixmap GetBitmap() const { return m_banner; }
enum
{
GAMECUBE_DISC = 0,
WII_DISC,
WII_WAD,
NUMBER_OF_PLATFORMS
};
private:
QString m_file_name;
QString m_folder_name;
@ -66,7 +58,7 @@ private:
quint64 m_volume_size = 0;
DiscIO::IVolume::ECountry m_country;
int m_platform;
DiscIO::IVolume::EPlatform m_platform;
u16 m_revision = 0;
QPixmap m_banner;