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 #2195 from JosJuice/nandcontentloader-singletons 

Don't construct NANDContentLoader classes before Main.cpp runs
This commit is contained in:
skidau 2015-03-13 12:20:43 +11:00
parent 899a5078a0 66bb3000c2
commit 2916aed1f9
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,9 +25,6 @@
namespace DiscIO namespace DiscIO
{ {
CSharedContent CSharedContent::m_Instance;
cUIDsys cUIDsys::m_Instance;
CSharedContent::CSharedContent() CSharedContent::CSharedContent()
{ {
@ -306,9 +303,6 @@ DiscIO::IVolume::ECountry CNANDContentLoader::GetCountry() const
} }
CNANDContentManager CNANDContentManager::m_Instance;
CNANDContentManager::~CNANDContentManager() CNANDContentManager::~CNANDContentManager()
{ {
for (auto& entry : m_Map) for (auto& entry : m_Map)

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

@ -64,11 +64,11 @@ public:
}; };
// we open the NAND Content files to often... lets cache them // we open the NAND Content files too often... let's cache them
class CNANDContentManager class CNANDContentManager
{ {
public: public:
static CNANDContentManager& Access() { return m_Instance; } static CNANDContentManager& Access() { static CNANDContentManager instance; return instance; }
u64 Install_WiiWAD(std::string &fileName); u64 Install_WiiWAD(std::string &fileName);
const INANDContentLoader& GetNANDLoader(const std::string& _rName, bool forceReload = false); const INANDContentLoader& GetNANDLoader(const std::string& _rName, bool forceReload = false);
@ -79,7 +79,8 @@ private:
CNANDContentManager() {} CNANDContentManager() {}
~CNANDContentManager(); ~CNANDContentManager();
static CNANDContentManager m_Instance; CNANDContentManager(CNANDContentManager const&) = delete;
void operator=(CNANDContentManager const&) = delete;
typedef std::map<std::string, INANDContentLoader*> CNANDContentMap; typedef std::map<std::string, INANDContentLoader*> CNANDContentMap;
CNANDContentMap m_Map; CNANDContentMap m_Map;
@ -88,7 +89,7 @@ private:
class CSharedContent class CSharedContent
{ {
public: public:
static CSharedContent& AccessInstance() { return m_Instance; } static CSharedContent& AccessInstance() { static CSharedContent instance; return instance; }
std::string GetFilenameFromSHA1(const u8* _pHash); std::string GetFilenameFromSHA1(const u8* _pHash);
std::string AddSharedContent(const u8* _pHash); std::string AddSharedContent(const u8* _pHash);
@ -98,6 +99,9 @@ private:
CSharedContent(); CSharedContent();
virtual ~CSharedContent(); virtual ~CSharedContent();
CSharedContent(CSharedContent const&) = delete;
void operator=(CSharedContent const&) = delete;
#pragma pack(push,1) #pragma pack(push,1)
struct SElement struct SElement
{ {
@ -109,13 +113,12 @@ private:
u32 m_lastID; u32 m_lastID;
std::string m_contentMap; std::string m_contentMap;
std::vector<SElement> m_Elements; std::vector<SElement> m_Elements;
static CSharedContent m_Instance;
}; };
class cUIDsys class cUIDsys
{ {
public: public:
static cUIDsys& AccessInstance() { return m_Instance; } static cUIDsys& AccessInstance() { static cUIDsys instance; return instance; }
u32 GetUIDFromTitle(u64 _Title); u32 GetUIDFromTitle(u64 _Title);
void AddTitle(u64 _Title); void AddTitle(u64 _Title);
@ -126,6 +129,9 @@ private:
cUIDsys(); cUIDsys();
virtual ~cUIDsys(); virtual ~cUIDsys();
cUIDsys(cUIDsys const&) = delete;
void operator=(cUIDsys const&) = delete;
#pragma pack(push,1) #pragma pack(push,1)
struct SElement struct SElement
{ {
@ -137,7 +143,6 @@ private:
u32 m_lastUID; u32 m_lastUID;
std::string m_uidSys; std::string m_uidSys;
std::vector<SElement> m_Elements; std::vector<SElement> m_Elements;
static cUIDsys m_Instance;
}; };
} }