ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDVD: Use disc track indexes for our track array.

This commit is contained in:
Ty Lamontagne 2024-11-24 14:16:38 -05:00 committed by Ty
parent e375f98f7a
commit 4d9cb885b2
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pcsx2/CDVD/CDVDdiscReader.cpp
View File

@ -76,35 +76,37 @@ void cdvdParseTOC()
strack = 0xFF; strack = 0xFF;
etrack = 0; etrack = 0;
int i = 0;
for (auto& entry : src->ReadTOC()) for (auto& entry : src->ReadTOC())
{ {
if (entry.track < 1 || entry.track > 99) const u8 track = entry.track;
if (track < 1 || track > 99)
{
Console.Warning("CDVD: Invalid track index %u, ignoring\n", track);
continue; continue;
strack = std::min(strack, entry.track); }
etrack = std::max(etrack, entry.track); strack = std::min(strack, track);
tracks[i].start_lba = entry.lba; etrack = std::max(etrack, track);
tracks[track].start_lba = entry.lba;
if ((entry.control & 0x0C) == 0x04) if ((entry.control & 0x0C) == 0x04)
{ {
std::array<u8, 2352> buffer; std::array<u8, 2352> buffer;
// Byte 15 of a raw CD data sector determines the track mode // Byte 15 of a raw CD data sector determines the track mode
if (src->ReadSectors2352(entry.lba, 1, buffer.data()) && (buffer[15] & 3) == 2) if (src->ReadSectors2352(entry.lba, 1, buffer.data()) && (buffer[15] & 3) == 2)
{ {
tracks[i].type = CDVD_MODE2_TRACK; tracks[track].type = CDVD_MODE2_TRACK;
} }
else else
{ {
tracks[i].type = CDVD_MODE1_TRACK; tracks[track].type = CDVD_MODE1_TRACK;
} }
} }
else else
{ {
tracks[i].type = CDVD_AUDIO_TRACK; tracks[track].type = CDVD_AUDIO_TRACK;
} }
fprintf(stderr, "Track %u start sector: %u\n", entry.track, entry.lba); #ifdef PCSX2_DEBUG
DevCon.Write("cdvdParseTOC: Track %u: LBA %u, Type %u\n", track, tracks[track].start_lba, tracks[track].type);
i += 1; #endif
} }
} }