sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CDSubChannelReplacement: Use subq union directly

Browse Source
This commit is contained in:
Connor McLaughlin
2020-07-22 00:02:44 +10:00
parent 93528db388
commit 03c3b10054
5 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/cd_subchannel_replacement.h
View File

@ -8,13 +8,6 @@
class CDSubChannelReplacement
{
public:
enum : u32
{
SUBCHANNEL_Q_SIZE = 12,
};
using ReplacementData = std::array<u8, SUBCHANNEL_Q_SIZE>;
CDSubChannelReplacement();
~CDSubChannelReplacement();
@ -22,14 +15,17 @@ public:
bool LoadSBI(const char* path);
/// Adds a sector to the replacement map.
void AddReplacementSubChannelQ(u32 lba, const CDImage::SubChannelQ& subq);
/// Returns the replacement subchannel data for the specified position (in BCD).
bool GetReplacementSubChannelQ(u8 minute_bcd, u8 second_bcd, u8 frame_bcd, ReplacementData& subq_data) const;
bool GetReplacementSubChannelQ(u8 minute_bcd, u8 second_bcd, u8 frame_bcd, CDImage::SubChannelQ* subq) const;
/// Returns the replacement subchannel data for the specified sector.
bool GetReplacementSubChannelQ(u32 lba, ReplacementData& subq_data) const;
bool GetReplacementSubChannelQ(u32 lba, CDImage::SubChannelQ* subq) const;
private:
using ReplacementMap = std::unordered_map<u32, ReplacementData>;
using ReplacementMap = std::unordered_map<u32, CDImage::SubChannelQ>;
ReplacementMap m_replacement_subq;
};