history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-05-07 08:05:42 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

CDROM: Factor in implicit seeks when calculating time

Browse Source
This commit is contained in:
Connor McLaughlin 2021-06-14 13:47:55 +10:00
parent f2bfbabdcb
commit 38288e6b36
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/cdrom.cpp
View File

@ -741,14 +741,16 @@ TickCount CDROM::GetTicksForSeek(CDImage::LBA new_lba)
if (g_settings.cdrom_seek_speedup == 0) if (g_settings.cdrom_seek_speedup == 0)
return MIN_TICKS; return MIN_TICKS;
UpdatePhysicalPosition(); u32 ticks = static_cast<u32>(MIN_TICKS);
if (IsSeeking())
ticks += m_drive_event->GetTicksUntilNextExecution();
else
UpdatePhysicalPosition();
const TickCount tps = System::GetTicksPerSecond(); const TickCount tps = System::GetTicksPerSecond();
const CDImage::LBA current_lba = m_secondary_status.motor_on ? m_physical_lba : 0; const CDImage::LBA current_lba = m_secondary_status.motor_on ? (IsSeeking() ? m_seek_end_lba : m_physical_lba) : 0;
const u32 lba_diff = static_cast<u32>((new_lba > current_lba) ? (new_lba - current_lba) : (current_lba - new_lba)); const u32 lba_diff = static_cast<u32>((new_lba > current_lba) ? (new_lba - current_lba) : (current_lba - new_lba));
u32 ticks = static_cast<u32>(MIN_TICKS);
// Motor spin-up time. // Motor spin-up time.
if (!m_secondary_status.motor_on) if (!m_secondary_status.motor_on)
{ {