mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 04:08:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't create new IOFiles when creating a blob

Browse source 
...except for WBFS, which is special because
it has the ability to open multiple files.
This commit is contained in:
JosJuice 2016-12-21 12:50:15 +01:00
commit 8d54bbc528
10 changed files with 93 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/DiscIO/TGCBlob.cpp
View file

@ -4,6 +4,7 @@
#include <memory>
#include <string>
#include <utility>
#include "Common/CommonFuncs.h"
#include "Common/FileUtil.h"
@ -56,18 +57,18 @@ void Replace32(u64 offset, u64 nbytes, u8* out_ptr, u64 replace_offset, u32 repl
namespace DiscIO
{
std::unique_ptr<TGCFileReader> TGCFileReader::Create(const std::string& path)
std::unique_ptr<TGCFileReader> TGCFileReader::Create(File::IOFile file)
{
File::IOFile file(path, "rb");
TGCHeader header;
if (file.ReadArray(&header, 1) && header.magic == TGC_MAGIC)
if (file.Seek(0, SEEK_SET) && file.ReadArray(&header, 1) && header.magic == TGC_MAGIC)
return std::unique_ptr<TGCFileReader>(new TGCFileReader(std::move(file)));
return nullptr;
}
TGCFileReader::TGCFileReader(File::IOFile&& file) : m_file(std::move(file))
TGCFileReader::TGCFileReader(File::IOFile file) : m_file(std::move(file))
{
m_file.Seek(0, SEEK_SET);
m_file.ReadArray(&m_header, 1);
u32 header_size = Common::swap32(m_header.header_size);
m_size = m_file.GetSize();