Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #19485 from hrydgard/misc-fixes

Browse source 
Fix issue with background music when going back to pause screen from game info screen, a couple of other minor issues
This commit is contained in:
Henrik Rydgård 2024-09-24 14:20:15 +02:00 • committed by GitHub
commit 0b34c3ad42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Core/FileSystems/DirectoryFileSystem.cpp
View file

@ -192,7 +192,7 @@ bool DirectoryFileHandle::Open(const Path &basePath, std::string &fileName, File
if (w32err == ERROR_DISK_FULL || w32err == ERROR_NOT_ENOUGH_QUOTA) {
// This is returned when the disk is full.
auto err = GetI18NCategory(I18NCat::ERRORS);
g_OSD.Show(OSDType::MESSAGE_ERROR, err->T("Disk full while writing data"));
g_OSD.Show(OSDType::MESSAGE_ERROR, err->T("Disk full while writing data"), 0.0f, "diskfull");
error = SCE_KERNEL_ERROR_ERRNO_NO_PERM;
} else if (!success) {
error = SCE_KERNEL_ERROR_ERRNO_FILE_NOT_FOUND;
@ -288,7 +288,7 @@ bool DirectoryFileHandle::Open(const Path &basePath, std::string &fileName, File
} else if (errno == ENOSPC) {
// This is returned when the disk is full.
auto err = GetI18NCategory(I18NCat::ERRORS);
g_OSD.Show(OSDType::MESSAGE_ERROR, err->T("Disk full while writing data"));
g_OSD.Show(OSDType::MESSAGE_ERROR, err->T("Disk full while writing data"), 0.0f, "diskfull");
error = SCE_KERNEL_ERROR_ERRNO_NO_PERM;
} else {
error = SCE_KERNEL_ERROR_ERRNO_FILE_NOT_FOUND;
@ -363,7 +363,7 @@ size_t DirectoryFileHandle::Write(const u8* pointer, s64 size)
if (diskFull) {
ERROR_LOG(Log::FileSystem, "Disk full");
auto err = GetI18NCategory(I18NCat::ERRORS);
g_OSD.Show(OSDType::MESSAGE_ERROR, err->T("Disk full while writing data"));
g_OSD.Show(OSDType::MESSAGE_ERROR, err->T("Disk full while writing data"), 0.0f, "diskfull");
// We only return an error when the disk is actually full.
// When writing this would cause the disk to be full, so it wasn't written, we return 0.
if (MemoryStick_FreeSpace() == 0) {

2
Core/HLE/proAdhoc.cpp
View file

@ -2283,7 +2283,7 @@ int initNetwork(SceNetAdhocctlAdhocId *adhoc_id){
socklen_t addrLen = sizeof(LocalIP);
memset(&LocalIP, 0, addrLen);
getsockname((int)metasocket, &LocalIP, &addrLen);
g_OSD.Show(OSDType::MESSAGE_SUCCESS, n->T("Network initialized"), 1.0);
g_OSD.Show(OSDType::MESSAGE_SUCCESS, n->T("Network initialized"), 1.0, "networkinit");
return 0;
} else {
return SOCKET_ERROR;

8
Core/MIPS/MIPSTracer.cpp
View file

@ -169,12 +169,12 @@ void MIPSTracer::stop_tracing() {
inline void MIPSTracer::print_stats() const {
// First, the storage
INFO_LOG(Log::JIT, "=============== MIPSTracer storage ===============");
INFO_LOG(Log::JIT, "Current index = %d, storage size = %d", storage.cur_index, storage.raw_instructions.size());
INFO_LOG(Log::JIT, "Current index = %d, storage size = %d", storage.cur_index, (int)storage.raw_instructions.size());
// Then the cyclic buffer
if (executed_blocks.overflow) {
INFO_LOG(Log::JIT, "=============== MIPSTracer cyclic buffer (overflow) ===============");
INFO_LOG(Log::JIT, "Trace size = %d, starts from index %d", executed_blocks.buffer.size(), executed_blocks.current_index);
INFO_LOG(Log::JIT, "Trace size = %d, starts from index %d", (int)executed_blocks.buffer.size(), executed_blocks.current_index);
}
else {
INFO_LOG(Log::JIT, "=============== MIPSTracer cyclic buffer (no overflow) ===============");
@ -182,11 +182,11 @@ inline void MIPSTracer::print_stats() const {
}
// Next, the hash-to-index mapping
INFO_LOG(Log::JIT, "=============== MIPSTracer hashes ===============");
INFO_LOG(Log::JIT, "Number of unique hashes = %d", hash_to_storage_index.size());
INFO_LOG(Log::JIT, "Number of unique hashes = %d", (int)hash_to_storage_index.size());
// Finally, the basic block list
INFO_LOG(Log::JIT, "=============== MIPSTracer basic block list ===============");
INFO_LOG(Log::JIT, "Number of processed basic blocks = %d", trace_info.size());
INFO_LOG(Log::JIT, "Number of processed basic blocks = %d", (int)trace_info.size());
INFO_LOG(Log::JIT, "=============== MIPSTracer stats end ===============");
}

8
UI/EmuScreen.cpp
View file

@ -836,10 +836,10 @@ void EmuScreen::onVKey(int virtualKeyCode, bool down) {
if (down) {
g_Config.bSaveNewTextures = !g_Config.bSaveNewTextures;
if (g_Config.bSaveNewTextures) {
g_OSD.Show(OSDType::MESSAGE_INFO, sc->T("saveNewTextures_true", "Textures will now be saved to your storage"), 2.0);
g_OSD.Show(OSDType::MESSAGE_INFO, sc->T("saveNewTextures_true", "Textures will now be saved to your storage"), 2.0, "savetexturechanged");
System_PostUIMessage(UIMessage::GPU_CONFIG_CHANGED);
} else {
g_OSD.Show(OSDType::MESSAGE_INFO, sc->T("saveNewTextures_false", "Texture saving was disabled"), 2.0);
g_OSD.Show(OSDType::MESSAGE_INFO, sc->T("saveNewTextures_false", "Texture saving was disabled"), 2.0, "savetexturechanged");
}
}
break;
@ -847,9 +847,9 @@ void EmuScreen::onVKey(int virtualKeyCode, bool down) {
if (down) {
g_Config.bReplaceTextures = !g_Config.bReplaceTextures;
if (g_Config.bReplaceTextures)
g_OSD.Show(OSDType::MESSAGE_INFO, sc->T("replaceTextures_true", "Texture replacement enabled"), 2.0);
g_OSD.Show(OSDType::MESSAGE_INFO, sc->T("replaceTextures_true", "Texture replacement enabled"), 2.0, "replacetexturechanged");
else
g_OSD.Show(OSDType::MESSAGE_INFO, sc->T("replaceTextures_false", "Textures no longer are being replaced"), 2.0);
g_OSD.Show(OSDType::MESSAGE_INFO, sc->T("replaceTextures_false", "Textures are no longer being replaced"), 2.0, "replacetexturechanged");
System_PostUIMessage(UIMessage::GPU_CONFIG_CHANGED);
}
break;

4
UI/PauseScreen.cpp
View file

@ -56,6 +56,7 @@
#include "UI/GameInfoCache.h"
#include "UI/DisplayLayoutScreen.h"
#include "UI/RetroAchievementScreens.h"
#include "UI/BackgroundAudio.h"
static void AfterSaveStateAction(SaveState::Status status, std::string_view message, void *) {
if (!message.empty() && (!g_Config.bDumpFrames || !g_Config.bDumpVideoOutput)) {
@ -480,6 +481,9 @@ void GamePauseScreen::dialogFinished(const Screen *dialog, DialogResult dr) {
if (tag == "ScreenshotView" && dr == DR_OK) {
finishNextFrame_ = true;
} else {
if (tag == "Game") {
g_BackgroundAudio.SetGame(Path());
}
// There may have been changes to our savestates, so let's recreate.
RecreateViews();
}

2
assets/lang/ar_AE.ini
View file

@ -1169,7 +1169,7 @@ LoadStateWrongVersion = Failed to load state: Savestate is for an older version
norewind = No rewind save states available.
Playing = جاري اللعب
PressESC = ‎إضغط خروج للدخول علي قائمة التوقف المؤقت.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = ‎حُفظت الحالة
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/az_AZ.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Failed to load state: Savestate is for an older version
norewind = No rewind save states available.
Playing = Playing
PressESC = Press ESC to open the pause menu.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = State saved
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/bg_BG.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Неуспех при зареждане на състо
norewind = No rewind save states available.
Playing = Playing
PressESC = Натиснете ESC за да отворите pause menu-то.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Състояние запазено
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/cz_CZ.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Nepodařilo se načíst stav: Stav je pro starší verzi
norewind = Nejsou dostupné žádné uložené stavy pro přetočení.
Playing = Playing
PressESC = Stiskněte ESC k otevření nabídky při pozastavení.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Stav uložen
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/da_DK.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Kunne ikke hente stauts: Spil-status er for en ældre ve
norewind = Ingen status for fortrydelse er tilgængelig.
Playing = Playing
PressESC = Tryk ESC for at åbne pause menu.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Gemte status
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/dr_ID.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Eda nabisa tiload mane: Save to jolora te' PPSSPP!
norewind = No rewind save states available.
Playing = Playing
PressESC = Pissi'ki' ESC ta melako menu.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Tiannami Savena
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/en_US.ini
View file

@ -1185,7 +1185,7 @@ LoadStateWrongVersion = Failed to load state: Savestate is for an older version
norewind = No rewind save states available.
Playing = Playing
PressESC = Press ESC to open the pause menu.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = State saved
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/fa_IR.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = ‎!است PPSSPP خطا در بارگیری: ذخیره
norewind = No rewind save states available.
Playing = Playing
PressESC = ‎.را برای منوی سریع فشار دهید ESC دکمه
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = ‎ذخیره شد
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/fi_FI.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Tilatallennuksen lataaminen epäonnistui: Tallennus on v
norewind = Takaisinkelauksen tilatallennuksia ei ole saatavilla.
Playing = Playing
PressESC = Press ESC to open the pause menu.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Tilatallennus tallennettu.
saveNewTextures_false = Tekstuurien tallennus oli pois käytöstä.

2
assets/lang/gl_ES.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Erro ó cargar o estado: o arquivo é dunha versión ant
norewind = Non hai estados gardados de rebobinado dispoñibles.
Playing = Playing
PressESC = Presiona Esc para abrir o menú de pausa.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Estado gardado
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/he_IL.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = לא הצליח לטעון את המצב: המצב הו
norewind = No rewind save states available.
Playing = Playing
PressESC = לחץ על ESC כדי לפתוח את התפריט.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = מצב נשמר
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/he_IL_invert.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = !PPSSPP לש רתוי הנשי הסרגל תדעוימש
norewind = No rewind save states available.
Playing = Playing
PressESC = .טירפתה תא חותפל ידכ ESC לע ץחל
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = רמשנ בצמ
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/jv_ID.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Gagal memuat: File simpen-cepet iki kanggi versi lawas P
norewind = No rewind save states available.
Playing = Playing
PressESC = Tekan ESC kanggo ing Menu.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Penyimpenan-cepet berhasil
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/ku_SO.ini
View file

@ -1175,7 +1175,7 @@ LoadStateWrongVersion = Failed to load state: Savestate is for an older version
norewind = No rewind save states available.
Playing = Playing
PressESC = Press ESC to open the pause menu.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = State saved
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/lo_LA.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = ລົ້ມເຫຼວໃນການໂຫຼດໄ
norewind = ບໍ່ມີຂໍ້ມູນໄຟລ໌ບັນທຶກແບບຍ້ອນຫຼັງ.
Playing = Playing
PressESC = ກົດ ESC ເພື່ອເປີດເມນູຢຸດຊົ່ວຄາວ
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = ເຊບເກມ
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/lt-LT.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Nepavyko pakrauti statuso: išsaugojimo statusas skirtas
norewind = No rewind save states available.
Playing = Playing
PressESC = Paspauskite ESC, kad atidarytumėte pauzės meniu.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Statusas išsaugotas
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/ms_MY.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Gagal memuatkan state: Savestate adalah untuk versi PPSS
norewind = No rewind save states available.
Playing = Playing
PressESC = Tekan ESC untuk membuka menu jeda.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = State disimpan
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/nl_NL.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Laden mislukt: Savestate is voor een oudere versie van P
norewind = Geen savestates beschikbaar voor terugspoelen.
Playing = Playing
PressESC = Druk op ESC om het pauzemenu te openen
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Savestate opgeslagen
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/no_NO.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Mislyktes å laste: Lagret fil er for en eldre versjon a
norewind = No rewind save states available.
Playing = Playing
PressESC = Press ESC to open the pause menu.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Lagret status
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/ro_RO.ini
View file

@ -1162,7 +1162,7 @@ LoadStateWrongVersion = Eroare la încărcare de stare: Starea e pt. o versiune
norewind = Fără stări salvare disponibile.
Playing = Playing
PressESC = Apasă ESC pt. a deschide meniul pauză.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Stare salvată
saveNewTextures_false = Texture saving was disabled.

2
assets/lang/vi_VN.ini
View file

@ -1161,7 +1161,7 @@ LoadStateWrongVersion = Không load được: file save là của một phiên b
norewind = Không tua lại được, trạng thái không có sẵn..
Playing = Playing
PressESC = Nhấn ESC để mở menu.
replaceTextures_false = Textures no longer are being replaced.
replaceTextures_false = Textures are no longer being replaced.
replaceTextures_true = Texture replacement is enabled.
Saved State = Đã save xong
saveNewTextures_false = Texture saving was disabled.

2
ext/vulkan/libvulkan.so.1
View file

@ -1 +1 @@
libvulkan.so.1.2.236
libvulkan.so.1.3.236