history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-18 12:55:47 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Fix double-reads hitting incorrect sector again

Browse Source 
Fixes Bedlem / Rise 2 without breaking Vigilante 8 - 2nd Offense.
This commit is contained in:
Connor McLaughlin
2020-06-02 00:59:11 +10:00
parent 5e7fd5aa71
commit dcfb929de5
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/cdrom.h
View File

@ -202,6 +202,10 @@ private:
{
return (m_drive_state == DriveState::SeekingLogical || m_drive_state == DriveState::SeekingPhysical);
}
bool IsReadingOrPlaying() const
{
return (m_drive_state == DriveState::Reading || m_drive_state == DriveState::Playing);
}
bool CanReadMedia() const { return (m_drive_state != DriveState::ShellOpening && m_reader.HasMedia()); }
bool HasPendingCommand() const { return m_command != Command::None; }
bool HasPendingInterrupt() const { return m_interrupt_flag_register != 0; }
@ -220,6 +224,7 @@ private:
TickCount GetTicksForRead();
TickCount GetTicksForSeek(CDImage::LBA new_lba);
TickCount GetTicksForStop(bool motor_was_on);
CDImage::LBA GetNextSectorToBeRead();
void BeginCommand(Command command); // also update status register
void EndCommand(); // also updates status register
void AbortCommand();