sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

System: Use existing CD media when loading state where possible

Browse Source
This commit is contained in:
Connor McLaughlin
2020-07-22 00:02:37 +10:00
parent 0398c6cb4a
commit 93528db388
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/cdrom.cpp
View File

@ -450,15 +450,15 @@ void CDROM::InsertMedia(std::unique_ptr<CDImage> media)
m_reader.SetMedia(std::move(media));
}
void CDROM::RemoveMedia(bool force /* = false */)
std::unique_ptr<CDImage> CDROM::RemoveMedia(bool force /* = false */)
{
if (!HasMedia() && !force)
return;
return nullptr;
const TickCount stop_ticks = GetTicksForStop(true);
Log_InfoPrintf("Removing CD...");
m_reader.RemoveMedia();
std::unique_ptr<CDImage> image = m_reader.RemoveMedia();
m_last_sector_header_valid = false;
@ -484,6 +484,8 @@ void CDROM::RemoveMedia(bool force /* = false */)
m_drive_state = DriveState::ShellOpening;
m_drive_event->SetIntervalAndSchedule(stop_ticks);
}
return image;
}
void CDROM::SetUseReadThread(bool enabled)