diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp index bdbd1a554a..f3948bf347 100644 --- a/Core/FileSystems/DirectoryFileSystem.cpp +++ b/Core/FileSystems/DirectoryFileSystem.cpp @@ -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) { diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp index e7e9832ac2..759e3a9c7d 100644 --- a/Core/HLE/proAdhoc.cpp +++ b/Core/HLE/proAdhoc.cpp @@ -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; diff --git a/Core/MIPS/MIPSTracer.cpp b/Core/MIPS/MIPSTracer.cpp index d921be8ba0..bd51f26061 100644 --- a/Core/MIPS/MIPSTracer.cpp +++ b/Core/MIPS/MIPSTracer.cpp @@ -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 ==============="); } diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 45aeb52d5c..361c026dde 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -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; diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index bfa00f2949..44a3d327a0 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -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(); } diff --git a/assets/lang/ar_AE.ini b/assets/lang/ar_AE.ini index 0ac1080920..3286e372df 100644 --- a/assets/lang/ar_AE.ini +++ b/assets/lang/ar_AE.ini @@ -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. diff --git a/assets/lang/az_AZ.ini b/assets/lang/az_AZ.ini index b66d3580ee..6983865263 100644 --- a/assets/lang/az_AZ.ini +++ b/assets/lang/az_AZ.ini @@ -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. diff --git a/assets/lang/bg_BG.ini b/assets/lang/bg_BG.ini index 0e3d6770dc..ba1b4e1b3b 100644 --- a/assets/lang/bg_BG.ini +++ b/assets/lang/bg_BG.ini @@ -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. diff --git a/assets/lang/cz_CZ.ini b/assets/lang/cz_CZ.ini index abe548fa37..1008141ead 100644 --- a/assets/lang/cz_CZ.ini +++ b/assets/lang/cz_CZ.ini @@ -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. diff --git a/assets/lang/da_DK.ini b/assets/lang/da_DK.ini index d90a87078a..516fc53ead 100644 --- a/assets/lang/da_DK.ini +++ b/assets/lang/da_DK.ini @@ -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. diff --git a/assets/lang/dr_ID.ini b/assets/lang/dr_ID.ini index 66e5c31d9c..78cbb712cd 100644 --- a/assets/lang/dr_ID.ini +++ b/assets/lang/dr_ID.ini @@ -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. diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini index fb46ec56b0..a0ff5bd68a 100644 --- a/assets/lang/en_US.ini +++ b/assets/lang/en_US.ini @@ -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. diff --git a/assets/lang/fa_IR.ini b/assets/lang/fa_IR.ini index 368fbbdf42..a91d3dd293 100644 --- a/assets/lang/fa_IR.ini +++ b/assets/lang/fa_IR.ini @@ -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. diff --git a/assets/lang/fi_FI.ini b/assets/lang/fi_FI.ini index fc1d352277..da391752c6 100644 --- a/assets/lang/fi_FI.ini +++ b/assets/lang/fi_FI.ini @@ -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ä. diff --git a/assets/lang/gl_ES.ini b/assets/lang/gl_ES.ini index f1f11a0a52..4befce476d 100644 --- a/assets/lang/gl_ES.ini +++ b/assets/lang/gl_ES.ini @@ -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. diff --git a/assets/lang/he_IL.ini b/assets/lang/he_IL.ini index b61213c627..7fa6efa05a 100644 --- a/assets/lang/he_IL.ini +++ b/assets/lang/he_IL.ini @@ -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. diff --git a/assets/lang/he_IL_invert.ini b/assets/lang/he_IL_invert.ini index 9de0e349aa..ece81d7f56 100644 --- a/assets/lang/he_IL_invert.ini +++ b/assets/lang/he_IL_invert.ini @@ -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. diff --git a/assets/lang/jv_ID.ini b/assets/lang/jv_ID.ini index dea69ebc3a..25ea69817c 100644 --- a/assets/lang/jv_ID.ini +++ b/assets/lang/jv_ID.ini @@ -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. diff --git a/assets/lang/ku_SO.ini b/assets/lang/ku_SO.ini index 694fc9fabd..9a1b48ef24 100644 --- a/assets/lang/ku_SO.ini +++ b/assets/lang/ku_SO.ini @@ -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. diff --git a/assets/lang/lo_LA.ini b/assets/lang/lo_LA.ini index e77646eb35..e0785529c1 100644 --- a/assets/lang/lo_LA.ini +++ b/assets/lang/lo_LA.ini @@ -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. diff --git a/assets/lang/lt-LT.ini b/assets/lang/lt-LT.ini index 202e1ca76c..1edb02c8e5 100644 --- a/assets/lang/lt-LT.ini +++ b/assets/lang/lt-LT.ini @@ -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. diff --git a/assets/lang/ms_MY.ini b/assets/lang/ms_MY.ini index c50d267dbd..a9de37c956 100644 --- a/assets/lang/ms_MY.ini +++ b/assets/lang/ms_MY.ini @@ -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. diff --git a/assets/lang/nl_NL.ini b/assets/lang/nl_NL.ini index 804e5bf776..e9e8714e74 100644 --- a/assets/lang/nl_NL.ini +++ b/assets/lang/nl_NL.ini @@ -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. diff --git a/assets/lang/no_NO.ini b/assets/lang/no_NO.ini index 843ba6bddb..8550f97f1a 100644 --- a/assets/lang/no_NO.ini +++ b/assets/lang/no_NO.ini @@ -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. diff --git a/assets/lang/ro_RO.ini b/assets/lang/ro_RO.ini index 40a6635e11..52268a55ee 100644 --- a/assets/lang/ro_RO.ini +++ b/assets/lang/ro_RO.ini @@ -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. diff --git a/assets/lang/vi_VN.ini b/assets/lang/vi_VN.ini index d905ea2166..3c0d936422 100644 --- a/assets/lang/vi_VN.ini +++ b/assets/lang/vi_VN.ini @@ -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. diff --git a/ext/vulkan/libvulkan.so.1 b/ext/vulkan/libvulkan.so.1 index 13b03264ef..88154c3f95 120000 --- a/ext/vulkan/libvulkan.so.1 +++ b/ext/vulkan/libvulkan.so.1 @@ -1 +1 @@ -libvulkan.so.1.2.236 \ No newline at end of file +libvulkan.so.1.3.236 \ No newline at end of file