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

Merge pull request #2484 from JosJuice/volume-return-types

Browse Source 
Volume: Use more appropriate types for some returned values
This commit is contained in:
comex
2015-06-02 20:29:08 -04:00
parent 2ae6fb9240 301218a103
commit 349f9d5493
15 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -97,8 +97,8 @@ static int CompareGameListItems(const GameListItem* iso1, const GameListItem* is
return t * (iso1->GetUniqueID() > iso2->GetUniqueID() ? 1 : -1);
if (iso1->GetRevision() != iso2->GetRevision())
return t * (iso1->GetRevision() > iso2->GetRevision() ? 1 : -1);
if (iso1->IsDiscTwo() != iso2->IsDiscTwo())
return t * (iso1->IsDiscTwo() ? 1 : -1);
if (iso1->GetDiscNumber() != iso2->GetDiscNumber())
return t * (iso1->GetDiscNumber() > iso2->GetDiscNumber() ? 1 : -1);
}
return strcasecmp(iso1->GetName(languageOne).c_str(),
iso2->GetName(languageOther).c_str()) * t;
@ -415,8 +415,12 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
if (gameini.GetIfExists("EmuState", "Title", &title))
name = title;
if (rISOFile.IsDiscTwo() && name.Lower().find("disc 2") == std::string::npos && name.Lower().find("disc2") == std::string::npos)
name = wxString::Format(_("%s (Disc 2)"), name.c_str());
int disc_number = rISOFile.GetDiscNumber() + 1;
if (disc_number > 1 && name.Lower().find(wxString::Format("disc %i", disc_number)) == std::string::npos
&& name.Lower().find(wxString::Format("disc%i", disc_number)) == std::string::npos)
{
name = wxString::Format(_("%s (Disc %i)"), name.c_str(), disc_number);
}
SetItem(_Index, COLUMN_TITLE, name, -1);
SetItem(_Index, COLUMN_MAKER, StrToWxStr(rISOFile.GetCompany()), -1);

6
Source/Core/DolphinWX/ISOFile.cpp
View File

@ -35,7 +35,7 @@
#include "DolphinWX/ISOFile.h"
#include "DolphinWX/WxUtils.h"
static const u32 CACHE_REVISION = 0x123;
static const u32 CACHE_REVISION = 0x124;
#define DVD_BANNER_WIDTH 96
#define DVD_BANNER_HEIGHT 32
@ -97,7 +97,7 @@ GameListItem::GameListItem(const std::string& _rFileName)
m_UniqueID = pVolume->GetUniqueID();
m_BlobCompressed = DiscIO::IsCompressedBlob(_rFileName);
m_IsDiscTwo = pVolume->IsDiscTwo();
m_disc_number = pVolume->GetDiscNumber();
m_Revision = pVolume->GetRevision();
std::vector<u32> Buffer = pVolume->GetBanner(&m_ImageWidth, &m_ImageHeight);
@ -183,7 +183,7 @@ void GameListItem::DoState(PointerWrap &p)
p.Do(m_ImageWidth);
p.Do(m_ImageHeight);
p.Do(m_Platform);
p.Do(m_IsDiscTwo);
p.Do(m_disc_number);
p.Do(m_Revision);
}

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

@ -31,7 +31,7 @@ public:
std::string GetDescription() const;
std::vector<DiscIO::IVolume::ELanguage> GetLanguages() const;
std::string GetCompany() const;
int GetRevision() const { return m_Revision; }
u16 GetRevision() const { return m_Revision; }
const std::string& GetUniqueID() const {return m_UniqueID;}
const std::string GetWiiFSPath() const;
DiscIO::IVolume::ECountry GetCountry() const {return m_Country;}
@ -41,7 +41,8 @@ public:
bool IsCompressed() const {return m_BlobCompressed;}
u64 GetFileSize() const {return m_FileSize;}
u64 GetVolumeSize() const {return m_VolumeSize;}
bool IsDiscTwo() const {return m_IsDiscTwo;}
// 0 is the first disc, 1 is the second disc
u8 GetDiscNumber() const {return m_disc_number;}
#if defined(HAVE_WX) && HAVE_WX
const wxBitmap& GetBitmap() const {return m_Bitmap;}
#endif
@ -73,7 +74,7 @@ private:
DiscIO::IVolume::ECountry m_Country;
int m_Platform;
int m_Revision;
u16 m_Revision;
#if defined(HAVE_WX) && HAVE_WX
wxBitmap m_Bitmap;
@ -82,7 +83,7 @@ private:
bool m_BlobCompressed;
std::vector<u8> m_pImage;
int m_ImageWidth, m_ImageHeight;
bool m_IsDiscTwo;
u8 m_disc_number;
bool LoadFromCache();
void SaveToCache();