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

GameListItem: Rename m_banner to m_volume_banner 

I want to clarify that it isn't used for PNG banners.
This commit is contained in:
JosJuice 2017-06-27 11:36:50 +02:00
parent 89716025da
commit caf6087766
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,8 +90,9 @@ GameListItem::GameListItem(const std::string& filename)
m_disc_number = volume->GetDiscNumber().value_or(0); m_disc_number = volume->GetDiscNumber().value_or(0);
m_revision = volume->GetRevision().value_or(0); m_revision = volume->GetRevision().value_or(0);
std::vector<u32> buffer = volume->GetBanner(&m_banner.width, &m_banner.height); auto& banner = m_volume_banner;
ReadVolumeBanner(&m_banner.buffer, buffer, m_banner.width, m_banner.height); std::vector<u32> buffer = volume->GetBanner(&banner.width, &banner.height);
ReadVolumeBanner(&banner.buffer, buffer, banner.width, banner.height);
m_valid = true; m_valid = true;
} }
@ -123,7 +124,7 @@ GameListItem::GameListItem(const std::string& filename)
else else
{ {
// Volume banner. Typical for everything that isn't a DOL or ELF. // Volume banner. Typical for everything that isn't a DOL or ELF.
SetWxBannerFromRaw(m_banner); SetWxBannerFromRaw(m_volume_banner);
} }
} }
@ -195,12 +196,12 @@ void GameListItem::DoState(PointerWrap& p)
p.Do(m_blob_type); p.Do(m_blob_type);
p.Do(m_revision); p.Do(m_revision);
p.Do(m_disc_number); p.Do(m_disc_number);
m_banner.DoState(p); m_volume_banner.DoState(p);
m_emu_state.DoState(p); m_emu_state.DoState(p);
p.Do(m_custom_name); p.Do(m_custom_name);
if (p.GetMode() == PointerWrap::MODE_READ) if (p.GetMode() == PointerWrap::MODE_READ)
{ {
SetWxBannerFromRaw(m_banner); SetWxBannerFromRaw(m_volume_banner);
} }
} }
@ -256,26 +257,26 @@ bool GameListItem::BannerChanged()
// so sometimes caches don't contain banners. Let's check // so sometimes caches don't contain banners. Let's check
// if a banner has become available after the cache was made. // if a banner has become available after the cache was made.
if (!m_banner.empty()) if (!m_volume_banner.empty())
return false; return false;
if (m_platform != DiscIO::Platform::WII_DISC && m_platform != DiscIO::Platform::WII_WAD) if (m_platform != DiscIO::Platform::WII_DISC && m_platform != DiscIO::Platform::WII_WAD)
return false; return false;
auto& banner = m_pending.banner; auto& banner = m_pending.volume_banner;
std::vector<u32> buffer = DiscIO::Volume::GetWiiBanner(&banner.width, &banner.height, m_title_id); std::vector<u32> buffer = DiscIO::Volume::GetWiiBanner(&banner.width, &banner.height, m_title_id);
if (!buffer.size()) if (!buffer.size())
return false; return false;
ReadVolumeBanner(&banner.buffer, buffer, banner.width, banner.height); ReadVolumeBanner(&banner.buffer, buffer, banner.width, banner.height);
// We only reach here if m_banner was empty, so we don't need to explicitly // We only reach here if m_volume_banner was empty, so we don't need to explicitly
// compare to see if they are different // compare to see if they are different
return true; return true;
} }
void GameListItem::BannerCommit() void GameListItem::BannerCommit()
{ {
m_banner = std::move(m_pending.banner); m_volume_banner = std::move(m_pending.volume_banner);
SetWxBannerFromRaw(m_banner); SetWxBannerFromRaw(m_volume_banner);
} }
std::string GameListItem::GetDescription(DiscIO::Language language) const std::string GameListItem::GetDescription(DiscIO::Language language) const

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

@ -95,6 +95,7 @@ private:
int height); int height);
// Outputs to m_banner_wx // Outputs to m_banner_wx
bool SetWxBannerFromPNGFile(const std::string& path); bool SetWxBannerFromPNGFile(const std::string& path);
// Outputs to m_banner_wx
void SetWxBannerFromRaw(const Banner& banner); void SetWxBannerFromRaw(const Banner& banner);
// IMPORTANT: Nearly all data members must be save/restored in DoState. // IMPORTANT: Nearly all data members must be save/restored in DoState.
@ -120,7 +121,7 @@ private:
u16 m_revision{}; u16 m_revision{};
u8 m_disc_number{}; u8 m_disc_number{};
Banner m_banner{}; Banner m_volume_banner{};
EmuState m_emu_state{}; EmuState m_emu_state{};
// Overridden name from TitleDatabase // Overridden name from TitleDatabase
std::string m_custom_name{}; std::string m_custom_name{};
@ -133,7 +134,7 @@ private:
struct struct
{ {
EmuState emu_state; EmuState emu_state;
Banner banner; Banner volume_banner;
std::string custom_name; std::string custom_name;
} m_pending{}; } m_pending{};
}; };