Merge pull request #18542 from hrydgard/plugin-load-message

Add a notification when loading a PPSSPP prx plugin

Core/HLE/Plugins.cpp

@@ -22,6 +22,9 @@
 #include "Common/File/FileUtil.h"
 #include "Common/File/DirListing.h"
 #include "Common/Serialize/SerializeFuncs.h"
+#include "Common/System/OSD.h"
+#include "Common/Data/Text/I18n.h"
+#include "Common/StringUtils.h"
 #include "Core/Config.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
@@ -173,25 +176,28 @@ void Init() {
 
 bool Load() {
 	bool started = false;
+
+	auto sy = GetI18NCategory(I18NCat::SYSTEM);
+
 	for (const std::string &filename : prxPlugins) {
+		std::string shortName = Path(filename).GetFilename();
+
 		std::string error_string = "";
 		SceUID module = KernelLoadModule(filename, &error_string);
-		if (!error_string.empty()) {
-			ERROR_LOG(SYSTEM, "Unable to load plugin %s: %s", filename.c_str(), error_string.c_str());
-			continue;
-		}
-		if (module < 0) {
-			ERROR_LOG(SYSTEM, "Unable to load plugin %s: %08x", filename.c_str(), module);
+		if (!error_string.empty() || module < 0) {
+			ERROR_LOG(SYSTEM, "Unable to load plugin %s (module %d): '%s'", filename.c_str(), module, error_string.c_str());
 			continue;
 		}
 
 		int ret = KernelStartModule(module, 0, 0, 0, nullptr, nullptr);
 		if (ret < 0) {
 			ERROR_LOG(SYSTEM, "Unable to start plugin %s: %08x", filename.c_str(), ret);
+		} else {
+			g_OSD.Show(OSDType::MESSAGE_SUCCESS, ApplySafeSubstitutions(sy->T("Loaded plugin: %1"), shortName));
+			started = true;
 		}
 
 		INFO_LOG(SYSTEM, "Loaded plugin: %s", filename.c_str());
-		started = true;
 	}
 
 	std::lock_guard<std::mutex> guard(g_inputMutex);

assets/lang/ar_AE.ini

@@ -1239,6 +1239,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = ‎اللغة
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = ‎تغيير الأسم المستعار

assets/lang/az_AZ.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Language
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Change nickname

assets/lang/bg_BG.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Език
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Промени прякор

assets/lang/ca_ES.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Llengua
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Change nickname

assets/lang/cz_CZ.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Jazyk
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Změnit přezdívku

assets/lang/da_DK.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Sprog
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Ændre kaldenavn

assets/lang/de_DE.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Sprache
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick Ordner
 Memory Stick size = Memory Stick size
 Change Nickname = Spitznamen ändern

assets/lang/dr_ID.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Bahasa
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Sullei Nickname

assets/lang/en_US.ini

@@ -1240,6 +1240,7 @@ AVI Dump started. = AVI dump started
 AVI Dump stopped. = AVI dump stopped
 Cache ISO in RAM = Cache full ISO in RAM
 Change CPU Clock = Change emulated PSP's CPU clock (unstable)
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Change nickname

assets/lang/es_ES.ini

@@ -1232,6 +1232,7 @@ Failed to load state for load undo. Error in the file system. = Falló la revers
 Floating symbols = Símbolos flotantes
 Game crashed = El juego se ha colgado
 Language = Idioma
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Directorio de Memory Stick
 Memory Stick size = Cambiar tamaño de Memory Stick (GB)
 Change Nickname = Cambiar apodo PSP

assets/lang/es_LA.ini

@@ -1233,6 +1233,7 @@ Failed to load state for load undo. Error in the file system. = Falló la revers
 Floating symbols = Símbolos flotantes
 Game crashed = Game crashed
 Language = Idioma
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Carpeta del Memory Stick
 Memory Stick size = Tamaño del Memory Stick
 Change Nickname = Cambiar nombre de usuario

assets/lang/fa_IR.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = ‎زبان
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = ‎تغییر نام

assets/lang/fi_FI.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Peli kaatui
 Language = Kieli
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Muistikortin kansio
 Memory Stick size = Muistikortin koko
 Change Nickname = Vaihda nimimerkkiä

assets/lang/fr_FR.ini

@@ -1222,6 +1222,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Langue
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Changer le dossier de la Memory Stick
 Memory Stick size = Changer la taille de la Memory Stick (Go)
 Change Nickname = Changer de pseudo

assets/lang/gl_ES.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Idioma
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = Cambiar alcume PSP

assets/lang/gr_EL.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Γλώσσα
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Αλλαγή φακέλου Memory Stick
 Memory Stick size = Memory Stick size
 Change Nickname = Αλλαγή Ψευδωνύμου

assets/lang/he_IL.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = שפה
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = שנה כינוי

assets/lang/he_IL_invert.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = הפש
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Memory Stick folder
 Memory Stick size = Memory Stick size
 Change Nickname = יוניכ הנש

assets/lang/hr_HR.ini

@@ -1231,6 +1231,7 @@ Failed to load state for load undo. Error in the file system. = Failed to load s
 Floating symbols = Floating symbols
 Game crashed = Game crashed
 Language = Jezik
+Loaded plugin: %1 = Loaded plugin: %1
 Memory Stick folder = Promijeni mapu Memorijskoga sticka
 Memory Stick size = Memory Stick size
 Change Nickname = Promijeni nadimak