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

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
parent d1ea00ed88
commit 8d54bbc528
10 changed files with 93 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/DiscIO/CISOBlob.cpp
View File

@ -5,6 +5,7 @@
#include <algorithm>
#include <cstdio>
#include <memory>
#include <utility>
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
@ -12,11 +13,12 @@
namespace DiscIO
{
CISOFileReader::CISOFileReader(std::FILE* file) : m_file(file)
CISOFileReader::CISOFileReader(File::IOFile file) : m_file(std::move(file))
{
m_size = m_file.GetSize();
CISOHeader header;
m_file.Seek(0, SEEK_SET);
m_file.ReadArray(&header, 1);
m_block_size = header.block_size;
@ -26,12 +28,11 @@ CISOFileReader::CISOFileReader(std::FILE* file) : m_file(file)
m_ciso_map[idx] = (1 == header.map[idx]) ? count++ : UNUSED_BLOCK_ID;
}
std::unique_ptr<CISOFileReader> CISOFileReader::Create(const std::string& filename)
std::unique_ptr<CISOFileReader> CISOFileReader::Create(File::IOFile file)
{
File::IOFile f(filename, "rb");
CISOHeader header;
if (f.ReadArray(&header, 1) && header.magic == CISO_MAGIC)
return std::unique_ptr<CISOFileReader>(new CISOFileReader(f.ReleaseHandle()));
if (file.Seek(0, SEEK_SET) && file.ReadArray(&header, 1) && header.magic == CISO_MAGIC)
return std::unique_ptr<CISOFileReader>(new CISOFileReader(std::move(file)));
return nullptr;
}