stenzek/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-10-12 02:23:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

CDImageCCD: Support loading ccd+img without sub

Browse Source
This commit is contained in:
Stenzek
2026-05-11 23:08:45 +10:00
parent ecc46d2d4e
commit 12450a1e0c
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/cd_image_ccd.cpp
+3 -6
View File
@@ -80,10 +80,7 @@ bool CDImageCCD::OpenAndParse(const char* filename, Error* error)
std::string sub_filename(Path::ReplaceExtension(filename, "sub"));
m_sub_file = FileSystem::OpenSharedCFile(sub_filename.c_str(), "rb", FileSystem::FileShareMode::DenyWrite, error);
if (!m_sub_file)
{
Error::AddPrefixFmt(error, "Failed to open sub file '{}': ", Path::GetFileName(sub_filename));
return false;
}
WARNING_LOG("Failed to open sub file '{}': ", Path::GetFileName(sub_filename));
// Parse CCD INI-style file into sections.
StringMap<StringMap<std::string>> sections;
@@ -417,7 +414,7 @@ bool CDImageCCD::ReadSectorFromIndex(void* buffer, const Index& index, LBA lba_i
bool CDImageCCD::ReadSubChannelQ(SubChannelQ* subq, const Index& index, LBA lba_in_index)
{
// For virtual pregaps (not in file), fall back to generated subchannel Q.
if (index.is_pregap && index.file_sector_size == 0)
if (!m_sub_file || (index.is_pregap && index.file_sector_size == 0))
return CDImage::ReadSubChannelQ(subq, index, lba_in_index);
// Q subchannel is the second 12-byte block (P, Q, R, S, T, U, V, W).
@@ -440,7 +437,7 @@ bool CDImageCCD::ReadSubChannelQ(SubChannelQ* subq, const Index& index, LBA lba_
bool CDImageCCD::HasSubchannelData() const
{
return true;
return (m_sub_file != nullptr);
}
s64 CDImageCCD::GetSizeOnDisk() const