ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4352 from lioncash/fwd 

NANDContentLoader: Add IOFile forward declaration
This commit is contained in:
shuffle2 2016-10-15 16:38:58 -07:00 committed by GitHub
parent 74939f316f d9eb7c4e80
commit d2d4edf964
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DiscIO/NANDContentLoader.cpp
View File

@ -96,6 +96,12 @@ std::string CSharedContent::AddSharedContent(const u8* hash)
return filename;
}
CNANDContentDataFile::CNANDContentDataFile(const std::string& filename) : m_filename{filename}
{
}
CNANDContentDataFile::~CNANDContentDataFile() = default;
void CNANDContentDataFile::EnsureOpen()
{
if (!m_file)

10
Source/Core/DiscIO/NANDContentLoader.h
View File

@ -13,13 +13,15 @@
#include "Common/CommonTypes.h"
#include "Common/NandPaths.h"
namespace DiscIO
namespace File
{
enum class Country;
class IOFile;
}
namespace DiscIO
{
enum class Country;
bool AddTicket(u64 title_id, const std::vector<u8>& ticket);
class CNANDContentData
@ -35,7 +37,9 @@ public:
class CNANDContentDataFile final : public CNANDContentData
{
public:
explicit CNANDContentDataFile(const std::string& filename) : m_filename(filename) {}
explicit CNANDContentDataFile(const std::string& filename);
~CNANDContentDataFile();
void Open() override;
std::vector<u8> Get() override;
bool GetRange(u32 start, u32 size, u8* buffer) override;