mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Move DiscIO enums to a new file
At first there weren't many enums in Volume.h, but the number has been growing, and I'm planning to add one more for regions. To not make Volume.h too large, and to avoid needing to include Volume.h in code that doesn't use volume objects, I'm moving the enums to a new file. I'm also turning them into enum classes while I'm at it.
This commit is contained in:
@ -10,15 +10,22 @@
|
||||
#include <vector>
|
||||
|
||||
#include "Common/Common.h"
|
||||
#include "DiscIO/Blob.h"
|
||||
#include "DiscIO/Volume.h"
|
||||
|
||||
#if defined(HAVE_WX) && HAVE_WX
|
||||
#include <wx/bitmap.h>
|
||||
#include <wx/image.h>
|
||||
#endif
|
||||
|
||||
namespace DiscIO
|
||||
{
|
||||
enum class BlobType;
|
||||
enum class Country;
|
||||
enum class Language;
|
||||
enum class Platform;
|
||||
}
|
||||
|
||||
class PointerWrap;
|
||||
|
||||
class GameListItem
|
||||
{
|
||||
public:
|
||||
@ -31,25 +38,21 @@ public:
|
||||
|
||||
bool IsValid() const { return m_Valid; }
|
||||
const std::string& GetFileName() const { return m_FileName; }
|
||||
std::string GetName(DiscIO::IVolume::ELanguage language) const;
|
||||
std::string GetName(DiscIO::Language language) const;
|
||||
std::string GetName() const;
|
||||
std::string GetDescription(DiscIO::IVolume::ELanguage language) const;
|
||||
std::string GetDescription(DiscIO::Language language) const;
|
||||
std::string GetDescription() const;
|
||||
std::vector<DiscIO::IVolume::ELanguage> GetLanguages() const;
|
||||
std::vector<DiscIO::Language> GetLanguages() const;
|
||||
std::string GetCompany() const { return m_company; }
|
||||
u16 GetRevision() const { return m_Revision; }
|
||||
const std::string& GetUniqueID() const { return m_UniqueID; }
|
||||
const std::string GetWiiFSPath() const;
|
||||
DiscIO::IVolume::ECountry GetCountry() const { return m_Country; }
|
||||
DiscIO::IVolume::EPlatform GetPlatform() const { return m_Platform; }
|
||||
DiscIO::Country GetCountry() const { return m_Country; }
|
||||
DiscIO::Platform GetPlatform() const { return m_Platform; }
|
||||
DiscIO::BlobType GetBlobType() const { return m_blob_type; }
|
||||
const std::string& GetIssues() const { return m_issues; }
|
||||
int GetEmuState() const { return m_emu_state; }
|
||||
bool IsCompressed() const
|
||||
{
|
||||
return m_blob_type == DiscIO::BlobType::GCZ || m_blob_type == DiscIO::BlobType::CISO ||
|
||||
m_blob_type == DiscIO::BlobType::WBFS;
|
||||
}
|
||||
bool IsCompressed() const;
|
||||
u64 GetFileSize() const { return m_FileSize; }
|
||||
u64 GetVolumeSize() const { return m_VolumeSize; }
|
||||
// 0 is the first disc, 1 is the second disc
|
||||
@ -63,8 +66,8 @@ public:
|
||||
private:
|
||||
std::string m_FileName;
|
||||
|
||||
std::map<DiscIO::IVolume::ELanguage, std::string> m_names;
|
||||
std::map<DiscIO::IVolume::ELanguage, std::string> m_descriptions;
|
||||
std::map<DiscIO::Language, std::string> m_names;
|
||||
std::map<DiscIO::Language, std::string> m_descriptions;
|
||||
std::string m_company;
|
||||
|
||||
std::string m_UniqueID;
|
||||
@ -76,8 +79,8 @@ private:
|
||||
u64 m_FileSize;
|
||||
u64 m_VolumeSize;
|
||||
|
||||
DiscIO::IVolume::ECountry m_Country;
|
||||
DiscIO::IVolume::EPlatform m_Platform;
|
||||
DiscIO::Country m_Country;
|
||||
DiscIO::Platform m_Platform;
|
||||
DiscIO::BlobType m_blob_type;
|
||||
u16 m_Revision;
|
||||
|
||||
|
Reference in New Issue
Block a user