piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 07:39:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

DiscIO/DirectoryBlob: Consolidate functions that take data for ContentSource to just take a ContentSource.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2021-09-21 07:58:41 +02:00
parent 7f57c24172
commit b988ab4441
2 changed files with 12 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Core/DiscIO/DirectoryBlob.cpp
View File

@ -61,18 +61,8 @@ constexpr u8 ENTRY_SIZE = 0x0c;
constexpr u8 FILE_ENTRY = 0;
constexpr u8 DIRECTORY_ENTRY = 1;
DiscContent::DiscContent(u64 offset, u64 size, const std::string& path)
: m_offset(offset), m_size(size), m_content_source(path)
{
}
DiscContent::DiscContent(u64 offset, u64 size, const u8* data)
: m_offset(offset), m_size(size), m_content_source(data)
{
}
DiscContent::DiscContent(u64 offset, u64 size, DirectoryBlobReader* blob)
: m_offset(offset), m_size(size), m_content_source(blob)
DiscContent::DiscContent(u64 offset, u64 size, ContentSource source)
: m_offset(offset), m_size(size), m_content_source(std::move(source))
{
}
@ -137,22 +127,10 @@ bool DiscContent::Read(u64* offset, u64* length, u8** buffer) const
return true;
}
void DiscContentContainer::Add(u64 offset, u64 size, const std::string& path)
void DiscContentContainer::Add(u64 offset, u64 size, ContentSource source)
{
if (size != 0)
m_contents.emplace(offset, size, path);
}
void DiscContentContainer::Add(u64 offset, u64 size, const u8* data)
{
if (size != 0)
m_contents.emplace(offset, size, data);
}
void DiscContentContainer::Add(u64 offset, u64 size, DirectoryBlobReader* blob)
{
if (size != 0)
m_contents.emplace(offset, size, blob);
m_contents.emplace(offset, size, std::move(source));
}
u64 DiscContentContainer::CheckSizeAndAdd(u64 offset, const std::string& path)