mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-05 01:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't read from volume when reloading Wii banners

Browse source 
Should make loading cached Wii games that lack banners slightly faster.
This commit is contained in:
JosJuice 2015-12-03 17:29:59 +01:00
parent a5904b522d
commit a0cd753060
12 changed files with 79 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/Core/DolphinQt/GameList/GameFile.cpp
View file

@ -24,7 +24,7 @@
#include "DolphinQt/GameList/GameFile.h"
static const u32 CACHE_REVISION = 0x00D; // Last changed in PR 3097
static const u32 CACHE_REVISION = 0x00E; // Last changed in PR 3309
static const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2
static QMap<DiscIO::IVolume::ELanguage, QString> ConvertLocalizedStrings(std::map<DiscIO::IVolume::ELanguage, std::string> strings)
@ -84,13 +84,11 @@ GameFile::GameFile(const QString& fileName)
// if a banner has become available after the cache was made.
if (m_banner.isNull())
{
std::unique_ptr<DiscIO::IVolume> volume(DiscIO::CreateVolumeFromFilename(fileName.toStdString()));
if (volume != nullptr)
{
ReadBanner(*volume);
if (!m_banner.isNull())
SaveToCache();
}
int width, height;
std::vector<u32> buffer = DiscIO::IVolume::GetWiiBanner(&width, &height, m_title_id);
ReadBanner(buffer, width, height);
if (!m_banner.isNull())
SaveToCache();
}
}
else
@ -112,10 +110,13 @@ GameFile::GameFile(const QString& fileName)
m_volume_size = volume->GetSize();
m_unique_id = QString::fromStdString(volume->GetUniqueID());
volume->GetTitleID(&m_title_id);
m_disc_number = volume->GetDiscNumber();
m_revision = volume->GetRevision();
ReadBanner(*volume);
int width, height;
std::vector<u32> buffer = volume->GetBanner(&width, &height);
ReadBanner(buffer, width, height);
m_valid = true;
SaveToCache();
@ -188,6 +189,7 @@ bool GameFile::LoadFromCache()
>> descriptions
>> m_company
>> m_unique_id
>> m_title_id
>> blob_type
>> m_file_size
>> m_volume_size
@ -231,6 +233,7 @@ void GameFile::SaveToCache()
<< CastLocalizedStrings<u8>(m_descriptions)
<< m_company
<< m_unique_id
<< m_title_id
<< (u32)m_blob_type
<< m_file_size
<< m_volume_size
@ -267,10 +270,8 @@ QString GameFile::CreateCacheFilename() const
}
// Outputs to m_banner
void GameFile::ReadBanner(const DiscIO::IVolume& volume)
void GameFile::ReadBanner(const std::vector<u32>& buffer, int width, int height)
{
int width, height;
std::vector<u32> buffer = volume.GetBanner(&width, &height);
QImage banner(width, height, QImage::Format_RGB888);
for (int i = 0; i < width * height; i++)
{

3
Source/Core/DolphinQt/GameList/GameFile.h
View file

@ -64,6 +64,7 @@ private:
QString m_company;
QString m_unique_id;
u64 m_title_id;
QString m_issues;
int m_emu_state = 0;
@ -87,7 +88,7 @@ private:
QString CreateCacheFilename() const;
// Outputs to m_banner
void ReadBanner(const DiscIO::IVolume& volume);
void ReadBanner(const std::vector<u32>& buffer, int width, int height);
// Outputs to m_short_names, m_long_names, m_descriptions, m_company.
// Returns whether a file was found, not whether it contained useful data.
bool ReadXML(const QString& file_path);