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

Merge pull request #2484 from JosJuice/volume-return-types

Browse Source 
Volume: Use more appropriate types for some returned values
This commit is contained in:
comex
2015-06-02 20:29:08 -04:00
parent 2ae6fb9240 301218a103
commit 349f9d5493
15 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DiscIO/Volume.h
View File

@ -75,7 +75,7 @@ public:
}
virtual std::string GetUniqueID() const = 0;
virtual std::string GetMakerID() const = 0;
virtual int GetRevision() const = 0;
virtual u16 GetRevision() const = 0;
virtual std::string GetInternalName() const = 0;
virtual std::map<ELanguage, std::string> GetNames() const = 0;
virtual std::map<ELanguage, std::string> GetDescriptions() const { return std::map<ELanguage, std::string>(); }
@ -83,8 +83,9 @@ public:
virtual std::vector<u32> GetBanner(int* width, int* height) const;
virtual u32 GetFSTSize() const = 0;
virtual std::string GetApploaderDate() const = 0;
// 0 is the first disc, 1 is the second disc
virtual u8 GetDiscNumber() const { return 0; }
virtual bool IsDiscTwo() const { return false; }
virtual bool IsWiiDisc() const { return false; }
virtual bool IsWadFile() const { return false; }
virtual bool SupportsIntegrityCheck() const { return false; }

2
Source/Core/DiscIO/VolumeDirectory.h
View File

@ -39,7 +39,7 @@ public:
std::string GetMakerID() const override;
int GetRevision() const override { return 0; }
u16 GetRevision() const override { return 0; }
std::string GetInternalName() const override;
std::map<IVolume::ELanguage, std::string> GetNames() const override;
void SetName(const std::string&);

10
Source/Core/DiscIO/VolumeGC.cpp
View File

@ -84,7 +84,7 @@ std::string CVolumeGC::GetMakerID() const
return makerID;
}
int CVolumeGC::GetRevision() const
u16 CVolumeGC::GetRevision() const
{
if (!m_pReader)
return 0;
@ -265,11 +265,11 @@ u64 CVolumeGC::GetRawSize() const
return 0;
}
bool CVolumeGC::IsDiscTwo() const
u8 CVolumeGC::GetDiscNumber() const
{
u8 disc_two_check;
Read(6, 1, &disc_two_check);
return (disc_two_check == 1);
u8 disc_number;
Read(6, 1, &disc_number);
return disc_number;
}
bool CVolumeGC::LoadBannerFile() const

5
Source/Core/DiscIO/VolumeGC.h
View File

@ -27,7 +27,7 @@ public:
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt = false) const override;
std::string GetUniqueID() const override;
std::string GetMakerID() const override;
int GetRevision() const override;
u16 GetRevision() const override;
virtual std::string GetInternalName() const override;
std::map<ELanguage, std::string> GetNames() const override;
std::map<ELanguage, std::string> GetDescriptions() const override;
@ -35,8 +35,7 @@ public:
std::vector<u32> GetBanner(int* width, int* height) const override;
u32 GetFSTSize() const override;
std::string GetApploaderDate() const override;
bool IsDiscTwo() const override;
u8 GetDiscNumber() const override;
ECountry GetCountry() const override;
u64 GetSize() const override;

2
Source/Core/DiscIO/VolumeWad.cpp
View File

@ -103,7 +103,7 @@ bool CVolumeWAD::GetTitleID(u8* _pBuffer) const
return true;
}
int CVolumeWAD::GetRevision() const
u16 CVolumeWAD::GetRevision() const
{
u16 revision;
if (!m_pReader->Read(m_tmd_offset + 0x1dc, 2, (u8*)&revision))

2
Source/Core/DiscIO/VolumeWad.h
View File

@ -30,7 +30,7 @@ public:
bool GetTitleID(u8* _pBuffer) const override;
std::string GetUniqueID() const override;
std::string GetMakerID() const override;
int GetRevision() const override;
u16 GetRevision() const override;
std::string GetInternalName() const override { return ""; }
std::map<IVolume::ELanguage, std::string> GetNames() const override;
u32 GetFSTSize() const override { return 0; }

11
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View File

@ -181,7 +181,7 @@ std::string CVolumeWiiCrypted::GetMakerID() const
return makerID;
}
int CVolumeWiiCrypted::GetRevision() const
u16 CVolumeWiiCrypted::GetRevision() const
{
if (!m_pReader)
return 0;
@ -243,14 +243,13 @@ bool CVolumeWiiCrypted::IsWiiDisc() const
return true;
}
bool CVolumeWiiCrypted::IsDiscTwo() const
u8 CVolumeWiiCrypted::GetDiscNumber() const
{
u8 disc_two_check;
m_pReader->Read(6, 1, &disc_two_check);
return (disc_two_check == 1);
u8 disc_number;
m_pReader->Read(6, 1, &disc_number);
return disc_number;
}
u64 CVolumeWiiCrypted::GetSize() const
{
if (m_pReader)

4
Source/Core/DiscIO/VolumeWiiCrypted.h
View File

@ -30,13 +30,13 @@ public:
virtual std::unique_ptr<u8[]> GetTMD(u32 *_sz) const override;
std::string GetUniqueID() const override;
std::string GetMakerID() const override;
int GetRevision() const override;
u16 GetRevision() const override;
std::string GetInternalName() const override;
std::map<IVolume::ELanguage, std::string> GetNames() const override;
u32 GetFSTSize() const override;
std::string GetApploaderDate() const override;
u8 GetDiscNumber() const override;
bool IsDiscTwo() const override;
bool IsWiiDisc() const override;
bool SupportsIntegrityCheck() const override { return true; }
bool CheckIntegrity() const override;