CDROM: Limit XA playback to first-identified file/channel

Fixes background music in initial menu of Tomb Raider III.
This commit is contained in:
Connor McLaughlin
2020-04-05 01:39:43 +10:00
parent cae2e09957
commit 45d7294c3c
3 changed files with 78 additions and 34 deletions

View File

@ -235,6 +235,7 @@ private:
void ProcessXAADPCMSector(const u8* raw_sector, const CDImage::SubChannelQ& subq);
void ProcessCDDASector(const u8* raw_sector, const CDImage::SubChannelQ& subq);
void BeginSeeking(bool logical, bool read_after_seek, bool play_after_seek);
void ResetCurrentXAFile();
void LoadDataFIFO();
void ClearSectorBuffers();
@ -266,8 +267,11 @@ private:
bool m_muted = false;
bool m_adpcm_muted = false;
u8 m_filter_file_number = 0;
u8 m_filter_channel_number = 0;
u8 m_xa_filter_file_number = 0;
u8 m_xa_filter_channel_number = 0;
u8 m_xa_current_file_number = 0;
u8 m_xa_current_channel_number = 0;
u8 m_xa_current_set = false;
CDImage::SectorHeader m_last_sector_header{};
CDXA::XASubHeader m_last_sector_subheader{};