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

Merge pull request #2985 from JosJuice/iselfordol

Browse Source 
DolphinWX: Don't use IsElfOrDol outside of ISOFile
This commit is contained in:
Lioncash
2015-09-11 12:28:57 -04:00
parent c07d672b31 4716c8ecf6
commit d7acf06505
3 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/ISOFile.h
View File

@ -43,7 +43,6 @@ public:
u64 GetVolumeSize() const {return m_VolumeSize;}
// 0 is the first disc, 1 is the second disc
u8 GetDiscNumber() const { return m_disc_number; }
bool IsElfOrDol() const;
#if defined(HAVE_WX) && HAVE_WX
const wxBitmap& GetBitmap() const {return m_Bitmap;}
@ -82,7 +81,8 @@ private:
bool LoadFromCache();
void SaveToCache();
std::string CreateCacheFilename();
bool IsElfOrDol() const;
std::string CreateCacheFilename() const;
// Outputs to m_pImage
void ReadVolumeBanner(const DiscIO::IVolume& volume);