From fcb2c5bd294334a2c00419b38c64a9fed22b6b85 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 19 May 2017 21:23:00 +0200 Subject: Remove CBlobBigEndianReader We can simply put ReadSwapped directly in IBlobReader. --- Source/Core/DiscIO/Volume.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Source/Core/DiscIO/Volume.cpp') diff --git a/Source/Core/DiscIO/Volume.cpp b/Source/Core/DiscIO/Volume.cpp index 21fece4484..d91272a329 100644 --- a/Source/Core/DiscIO/Volume.cpp +++ b/Source/Core/DiscIO/Volume.cpp @@ -88,13 +88,12 @@ std::unique_ptr CreateVolumeFromFilename(const std::string& filename) std::unique_ptr reader(CreateBlobReader(filename)); if (reader == nullptr) return nullptr; - CBlobBigEndianReader be_reader(*reader); // Check for Wii u32 wii_magic = 0; - be_reader.ReadSwapped(0x18, &wii_magic); + reader->ReadSwapped(0x18, &wii_magic); u32 wii_container_magic = 0; - be_reader.ReadSwapped(0x60, &wii_container_magic); + reader->ReadSwapped(0x60, &wii_container_magic); if (wii_magic == 0x5D1C9EA3 && wii_container_magic != 0) return std::make_unique(std::move(reader)); if (wii_magic == 0x5D1C9EA3 && wii_container_magic == 0) @@ -103,13 +102,13 @@ std::unique_ptr CreateVolumeFromFilename(const std::string& filename) // Check for WAD // 0x206962 for boot2 wads u32 wad_magic = 0; - be_reader.ReadSwapped(0x02, &wad_magic); + reader->ReadSwapped(0x02, &wad_magic); if (wad_magic == 0x00204973 || wad_magic == 0x00206962) return std::make_unique(std::move(reader)); // Check for GC u32 gc_magic = 0; - be_reader.ReadSwapped(0x1C, &gc_magic); + reader->ReadSwapped(0x1C, &gc_magic); if (gc_magic == 0xC2339F3D) return std::make_unique(std::move(reader)); -- cgit v1.2.3