DiscIO: Use std::optional for GetTitleID instead of pointer

This makes the interface slightly cleaner and a bit more consistent
with the other getters. Still not fully the same, since the others
don't really handle failures with std::optional; but at least the
value is returned by value now, as opposed to having the function
take a pointer to a u64.
This commit is contained in:
Léo Lam
2017-06-03 21:29:08 +02:00
parent 5d6074f157
commit 1a17c02d6f
9 changed files with 31 additions and 26 deletions

View File

@ -107,9 +107,12 @@ std::string CVolumeWAD::GetMakerID(const Partition& partition) const
return DecodeString(temp);
}
bool CVolumeWAD::GetTitleID(u64* buffer, const Partition& partition) const
std::optional<u64> CVolumeWAD::GetTitleID(const Partition& partition) const
{
return ReadSwapped(m_offset + 0x01DC, buffer, partition);
u64 title_id;
if (!ReadSwapped(m_offset + 0x01DC, &title_id, partition))
return {};
return title_id;
}
u16 CVolumeWAD::GetRevision(const Partition& partition) const
@ -141,11 +144,11 @@ std::vector<u32> CVolumeWAD::GetBanner(int* width, int* height) const
*width = 0;
*height = 0;
u64 title_id;
if (!GetTitleID(&title_id))
const std::optional<u64> title_id = GetTitleID();
if (!title_id)
return std::vector<u32>();
return GetWiiBanner(width, height, title_id);
return GetWiiBanner(width, height, *title_id);
}
BlobType CVolumeWAD::GetBlobType() const