mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-17 11:24:27 +01:00
Improve handling of UMD Video (still unsupported but show background and icon, fix info screen)
This commit is contained in:
1 parent
998d385119
commit
cdd9d34af9
5 files changed
+69
-42
No files matched your search
+29
-20
@@ -364,14 +364,20 @@ bool GameInfo::DeleteAllSaveData() {
|
||||
return true;
|
||||
}
|
||||
|
||||
void GameInfo::ParseParamSFO() {
|
||||
void GameInfo::ParseParamSFO(IdentifiedFileType type) {
|
||||
title = paramSFO.GetValueString("TITLE");
|
||||
id = paramSFO.GetValueString("DISC_ID");
|
||||
id_version = id + "_" + paramSFO.GetValueString("DISC_VERSION");
|
||||
disc_total = paramSFO.GetValueInt("DISC_TOTAL");
|
||||
disc_number = paramSFO.GetValueInt("DISC_NUMBER");
|
||||
// region = paramSFO.GetValueInt("REGION"); // Always seems to be 32768?
|
||||
region = DetectGameRegionFromID(id);
|
||||
if (type != IdentifiedFileType::PSP_UMD_VIDEO_ISO) {
|
||||
id = paramSFO.GetValueString("DISC_ID");
|
||||
id_version = id + "_" + paramSFO.GetValueString("DISC_VERSION");
|
||||
disc_total = paramSFO.GetValueInt("DISC_TOTAL");
|
||||
disc_number = paramSFO.GetValueInt("DISC_NUMBER");
|
||||
// region = paramSFO.GetValueInt("REGION"); // Always seems to be 32768?
|
||||
region = DetectGameRegionFromID(id);
|
||||
} else {
|
||||
id.clear();
|
||||
id_version.clear();
|
||||
region = GameRegion::UNKNOWN;
|
||||
}
|
||||
}
|
||||
|
||||
std::string GameInfo::GetTitle() {
|
||||
@@ -437,13 +443,14 @@ void GameInfo::SetupTexture(Draw::DrawContext *thin3d, GameInfoTex &tex) {
|
||||
}
|
||||
}
|
||||
|
||||
static bool ReadFileToString(IFileSystem *fs, const char *filename, std::string *contents, std::mutex *mtx) {
|
||||
PSPFileInfo info = fs->GetFileInfo(filename);
|
||||
static bool ReadFileToString(IFileSystem *fs, std::string_view filename, std::string *contents, std::mutex *mtx) {
|
||||
std::string fn(filename);
|
||||
PSPFileInfo info = fs->GetFileInfo(fn);
|
||||
if (!info.exists) {
|
||||
return false;
|
||||
}
|
||||
|
||||
int handle = fs->OpenFile(filename, FILEACCESS_READ);
|
||||
int handle = fs->OpenFile(fn, FILEACCESS_READ);
|
||||
if (handle < 0) {
|
||||
return false;
|
||||
}
|
||||
@@ -561,7 +568,6 @@ public:
|
||||
switch (info_->fileType) {
|
||||
case IdentifiedFileType::PSP_PBP:
|
||||
case IdentifiedFileType::PSP_PBP_DIRECTORY:
|
||||
case IdentifiedFileType::PSP_UMD_VIDEO_ISO:
|
||||
{
|
||||
auto pbpLoader = info_->GetFileLoader();
|
||||
if (info_->fileType == IdentifiedFileType::PSP_PBP_DIRECTORY) {
|
||||
@@ -590,7 +596,7 @@ public:
|
||||
if (pbp.GetSubFile(PBP_PARAM_SFO, &sfoData)) {
|
||||
std::lock_guard<std::mutex> lock(info_->lock);
|
||||
info_->paramSFO.ReadSFO(sfoData);
|
||||
info_->ParseParamSFO();
|
||||
info_->ParseParamSFO(info_->fileType);
|
||||
|
||||
// Assuming PSP_PBP_DIRECTORY without ID or with disc_total < 1 in GAME dir must be homebrew
|
||||
if ((info_->id.empty() || !info_->disc_total)
|
||||
@@ -697,7 +703,7 @@ handleELF:
|
||||
if (ReadFileToString(&umd, "/PARAM.SFO", ¶mSFOcontents, 0)) {
|
||||
std::lock_guard<std::mutex> lock(info_->lock);
|
||||
info_->paramSFO.ReadSFO((const u8 *)paramSFOcontents.data(), paramSFOcontents.size());
|
||||
info_->ParseParamSFO();
|
||||
info_->ParseParamSFO(info_->fileType);
|
||||
info_->MarkReadyNoLock(GameInfoFlags::PARAM_SFO);
|
||||
}
|
||||
}
|
||||
@@ -754,7 +760,7 @@ handleELF:
|
||||
if (ReadFileToString(&umd, "/PSP_GAME/PARAM.SFO", ¶mSFOcontents, nullptr)) {
|
||||
std::lock_guard<std::mutex> lock(info_->lock);
|
||||
info_->paramSFO.ReadSFO((const u8 *)paramSFOcontents.data(), paramSFOcontents.size());
|
||||
info_->ParseParamSFO();
|
||||
info_->ParseParamSFO(info_->fileType);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -779,7 +785,9 @@ handleELF:
|
||||
|
||||
case IdentifiedFileType::PSP_ISO:
|
||||
case IdentifiedFileType::PSP_ISO_NP:
|
||||
case IdentifiedFileType::PSP_UMD_VIDEO_ISO:
|
||||
{
|
||||
std::string_view gameRoot = info_->fileType == IdentifiedFileType::PSP_UMD_VIDEO_ISO ? "/UMD_VIDEO/" : "/PSP_GAME/";
|
||||
SequentialHandleAllocator handles;
|
||||
// Let's assume it's an ISO.
|
||||
// TODO: This will currently read in the whole directory tree. Not really necessary for just a
|
||||
@@ -804,11 +812,12 @@ handleELF:
|
||||
// Alright, let's fetch the PARAM.SFO.
|
||||
if (flags_ & GameInfoFlags::PARAM_SFO) {
|
||||
std::string paramSFOcontents;
|
||||
if (ReadFileToString(&umd, "/PSP_GAME/PARAM.SFO", ¶mSFOcontents, nullptr)) {
|
||||
|
||||
if (ReadFileToString(&umd, join(gameRoot, "PARAM.SFO"), ¶mSFOcontents, nullptr)) {
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(info_->lock);
|
||||
info_->paramSFO.ReadSFO((const u8 *)paramSFOcontents.data(), paramSFOcontents.size());
|
||||
info_->ParseParamSFO();
|
||||
info_->ParseParamSFO(info_->fileType);
|
||||
|
||||
// quick-update the info while we have the lock, so we don't need to wait for the image load to display the title.
|
||||
info_->MarkReadyNoLock(GameInfoFlags::PARAM_SFO);
|
||||
@@ -819,15 +828,15 @@ handleELF:
|
||||
}
|
||||
|
||||
if (flags_ & GameInfoFlags::PIC0) {
|
||||
info_->pic0.dataLoaded = ReadFileToString(&umd, "/PSP_GAME/PIC0.PNG", &info_->pic0.data, &info_->lock);
|
||||
info_->pic0.dataLoaded = ReadFileToString(&umd, join(gameRoot, "PIC0.PNG"), &info_->pic0.data, &info_->lock);
|
||||
}
|
||||
|
||||
if (flags_ & GameInfoFlags::PIC1) {
|
||||
info_->pic1.dataLoaded = ReadFileToString(&umd, "/PSP_GAME/PIC1.PNG", &info_->pic1.data, &info_->lock);
|
||||
info_->pic1.dataLoaded = ReadFileToString(&umd, join(gameRoot, "PIC1.PNG"), &info_->pic1.data, &info_->lock);
|
||||
}
|
||||
|
||||
if (flags_ & GameInfoFlags::SND) {
|
||||
info_->sndDataLoaded = ReadFileToString(&umd, "/PSP_GAME/SND0.AT3", &info_->sndFileData, &info_->lock);
|
||||
info_->sndDataLoaded = ReadFileToString(&umd, join(gameRoot, "SND0.AT3"), &info_->sndFileData, &info_->lock);
|
||||
}
|
||||
|
||||
// Fall back to unknown icon if ISO is broken/is a homebrew ISO, override is allowed though
|
||||
@@ -835,7 +844,7 @@ handleELF:
|
||||
if (flags_ & GameInfoFlags::ICON) {
|
||||
if (LoadReplacementImage(info_.get(), &info_->icon, "icon.png")) {
|
||||
// Nothing more to do
|
||||
} else if (ReadFileToString(&umd, "/PSP_GAME/ICON0.PNG", &info_->icon.data, &info_->lock)) {
|
||||
} else if (ReadFileToString(&umd, join(gameRoot, "ICON0.PNG"), &info_->icon.data, &info_->lock)) {
|
||||
info_->icon.dataLoaded = true;
|
||||
} else {
|
||||
Path screenshot_jpg = GetSysDirectory(DIRECTORY_SCREENSHOT) / (info_->id + "_00000.jpg");
|
||||
|
||||
Reference in new issue
Block a user