diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2025-11-10 17:29:43 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-10 17:29:43 -0600 |
| commit | f51eaf3282416157af1f58f4803c683dcae7e70f (patch) | |
| tree | 1218824f42541a80591317b3b629923b007d111a /Source/Core/DiscIO/Blob.cpp | |
| parent | cd4902f0ed68ffac9f1e4ab853f37eefa34e6ae2 (diff) | |
| parent | 9e2fc7f4ddba14b1e7123d1654b385b21c71c744 (diff) | |
Merge pull request #14052 from jordan-woyak/DirectIOFile
Common and DiscIO: Introduce a thread safe DirectIOFile and make BlobReader implementations use it.
Diffstat (limited to 'Source/Core/DiscIO/Blob.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Blob.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp index 9e1ddb9ead..aad8b60b5e 100644 --- a/Source/Core/DiscIO/Blob.cpp +++ b/Source/Core/DiscIO/Blob.cpp @@ -4,14 +4,13 @@ #include "DiscIO/Blob.h" #include <algorithm> -#include <cstddef> -#include <limits> #include <memory> #include <string> #include <utility> +#include "Common/BitUtils.h" #include "Common/CommonTypes.h" -#include "Common/IOFile.h" +#include "Common/DirectIOFile.h" #include "Common/MsgHandler.h" #include "DiscIO/CISOBlob.h" @@ -213,9 +212,9 @@ u32 SectorReader::ReadChunk(u8* buffer, u64 chunk_num) std::unique_ptr<BlobReader> CreateBlobReader(const std::string& filename) { - File::IOFile file(filename, "rb"); + File::DirectIOFile file(filename, File::AccessMode::Read); u32 magic; - if (!file.ReadArray(&magic, 1)) + if (!file.Read(Common::AsWritableU8Span(magic))) return nullptr; // Conveniently, every supported file format (except for plain disc images and |