Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-26 15:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Defer set of autopause track

Browse source 
Pitball's menu music starts mid-second, and there's no pregap,
so the first couple of reports are for the previous track.

It doesn't enable autopause until receiving a couple, and it's
actually playing the track it wants.
This commit is contained in:
Stenzek 2024-07-17 18:15:20 +10:00
parent fb747d6ded
commit 44b9d16d9f
No known key found for this signature in database
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/cdrom.cpp
View file

@ -2903,15 +2903,22 @@ void CDROM::DoSectorRead()
} }
const bool is_data_sector = subq.IsData(); const bool is_data_sector = subq.IsData();
if (!is_data_sector) if (is_data_sector)
{ {
ProcessDataSectorHeader(s_reader.GetSectorBuffer().data());
}
else if (s_mode.auto_pause)
{
// Only update the tracked track-to-pause-after once auto pause is enabled. Pitball's menu music starts mid-second,
// and there's no pregap, so the first couple of reports are for the previous track. It doesn't enable autopause
// until receiving a couple, and it's actually playing the track it wants.
if (s_play_track_number_bcd == 0) if (s_play_track_number_bcd == 0)
{ {
// track number was not specified, but we've found the track now // track number was not specified, but we've found the track now
s_play_track_number_bcd = subq.track_number_bcd; s_play_track_number_bcd = subq.track_number_bcd;
DEBUG_LOG("Setting playing track number to {}", s_play_track_number_bcd); DEBUG_LOG("Setting playing track number to {}", s_play_track_number_bcd);
} }
else if (s_mode.auto_pause && subq.track_number_bcd != s_play_track_number_bcd) else if (subq.track_number_bcd != s_play_track_number_bcd)
{ {
// we don't want to update the position if the track changes, so we check it before reading the actual sector. // we don't want to update the position if the track changes, so we check it before reading the actual sector.
DEV_LOG("Auto pause at the start of track {:02x} (LBA {})", s_last_subq.track_number_bcd, s_current_lba); DEV_LOG("Auto pause at the start of track {:02x} (LBA {})", s_last_subq.track_number_bcd, s_current_lba);
@ -2919,10 +2926,6 @@ void CDROM::DoSectorRead()
return; return;
} }
} }
else
{
ProcessDataSectorHeader(s_reader.GetSectorBuffer().data());
}
u32 next_sector = s_current_lba + 1u; u32 next_sector = s_current_lba + 1u;
if (is_data_sector && s_drive_state == DriveState::Reading) if (is_data_sector && s_drive_state == DriveState::Reading)