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

Use an ID-to-name map when volume has no company string

Browse Source 
This is written so that the result of GetCompanyFromID never is cached
(except on Android?). Caching is unnecessary because the string can be
obtained quickly at runtime, and not caching it means that the cache
doesn't have to be invalidated when GetCompanyFromID is edited.
This commit is contained in:
JosJuice
2015-05-24 17:41:53 +02:00
parent a784a12b51
commit d2e6adb045
5 changed files with 411 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,9 @@ GameListItem::GameListItem(const std::string& _rFileName)
}
}
if (m_company.empty() && m_UniqueID.size() >= 6)
m_company = DiscIO::GetCompanyFromID(m_UniqueID.substr(4, 2));
if (IsValid())
{
IniFile ini = SCoreStartupParameter::LoadGameIni(m_UniqueID, m_Revision);

7
Source/Core/DolphinWX/MainAndroid.cpp
View File

@ -312,10 +312,9 @@ static std::string GetCompany(std::string filename)
DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(filename);
if (pVolume != nullptr)
{
std::string date = pVolume->GetCompany();
__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Company: %s", date.c_str());
return date;
std::string company = DiscIO::GetCompanyFromID(pVolume->GetMakerID());
__android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Company: %s", company.c_str());
return company;
}
return std::string ("");
}