[Scummvm-git-logs] scummvm master -> 7a9fbf5f483e11bb8621971b9a6d56ced846c66e

[spleen1981]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
66d690e50d LIBRETRO: add retro_get_core_dir
7a9fbf5f48 LIBRETRO: align with FSNode class changes


Commit: 66d690e50dcf239657a7215eeb19d8c9834b0bdd
    https://github.com/scummvm/scummvm/commit/66d690e50dcf239657a7215eeb19d8c9834b0bdd
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-12-31T16:56:37+01:00

Commit Message:
LIBRETRO: add retro_get_core_dir

Changed paths:
    backends/platform/libretro/include/libretro-core.h
    backends/platform/libretro/src/libretro-core.cpp


diff --git a/backends/platform/libretro/include/libretro-core.h b/backends/platform/libretro/include/libretro-core.h
index fc3db85b958..ef48cbe209b 100644
--- a/backends/platform/libretro/include/libretro-core.h
+++ b/backends/platform/libretro/include/libretro-core.h
@@ -27,6 +27,7 @@ bool retro_get_input_bitmask_supported(void);
 void reset_performance_tuner(void);
 void retro_osd_notification(const char* msg);
 int retro_get_input_device(void);
+const char * retro_get_core_dir(void);
 const char * retro_get_system_dir(void);
 const char * retro_get_save_dir(void);
 
diff --git a/backends/platform/libretro/src/libretro-core.cpp b/backends/platform/libretro/src/libretro-core.cpp
index 39c4d27478b..18a0c1af54e 100644
--- a/backends/platform/libretro/src/libretro-core.cpp
+++ b/backends/platform/libretro/src/libretro-core.cpp
@@ -731,6 +731,14 @@ void retro_get_system_av_info(struct retro_system_av_info *info) {
 	info->timing.sample_rate = sample_rate;
 }
 
+const char *retro_get_core_dir(void) {
+	const char *coredir = NULL;
+
+	environ_cb(RETRO_ENVIRONMENT_GET_LIBRETRO_PATH, &coredir);
+
+	return coredir;
+}
+
 const char *retro_get_system_dir(void) {
 	const char *sysdir = NULL;
 


Commit: 7a9fbf5f483e11bb8621971b9a6d56ced846c66e
    https://github.com/scummvm/scummvm/commit/7a9fbf5f483e11bb8621971b9a6d56ced846c66e
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-12-31T16:56:51+01:00

Commit Message:
LIBRETRO: align with FSNode class changes

Changed paths:
    backends/platform/libretro/src/libretro-core.cpp
    backends/platform/libretro/src/libretro-os-utils.cpp


diff --git a/backends/platform/libretro/src/libretro-core.cpp b/backends/platform/libretro/src/libretro-core.cpp
index 18a0c1af54e..5bb1f5d9de5 100644
--- a/backends/platform/libretro/src/libretro-core.cpp
+++ b/backends/platform/libretro/src/libretro-core.cpp
@@ -895,13 +895,13 @@ bool retro_load_game(const struct retro_game_info *game) {
 				}
 			}
 
-			test_game_status = LIBRETRO_G_SYSTEM->testGame(parent_dir.getPath().c_str(), true);
+			test_game_status = LIBRETRO_G_SYSTEM->testGame(parent_dir.getPath().toString().c_str(), true);
 		}
 
 		// Preliminary game scan results
 		switch (test_game_status) {
 		case TEST_GAME_OK_ID_FOUND:
-			sprintf(buffer, "-p \"%s\" %s", parent_dir.getPath().c_str(), target_id);
+			sprintf(buffer, "-p \"%s\" %s", parent_dir.getPath().toString().c_str(), target_id);
 			retro_log_cb(RETRO_LOG_DEBUG, "[scummvm] launch via target id and game dir\n");
 			break;
 		case TEST_GAME_OK_TARGET_FOUND:
@@ -909,7 +909,7 @@ bool retro_load_game(const struct retro_game_info *game) {
 			retro_log_cb(RETRO_LOG_DEBUG, "[scummvm] launch via target id and scummvm.ini\n");
 			break;
 		case TEST_GAME_OK_ID_AUTODETECTED:
-			sprintf(buffer, "-p \"%s\" --auto-detect", parent_dir.getPath().c_str());
+			sprintf(buffer, "-p \"%s\" --auto-detect", parent_dir.getPath().toString().c_str());
 			retro_log_cb(RETRO_LOG_DEBUG, "[scummvm] launch via autodetect\n");
 			break;
 		case TEST_GAME_KO_MULTIPLE_RESULTS:
diff --git a/backends/platform/libretro/src/libretro-os-utils.cpp b/backends/platform/libretro/src/libretro-os-utils.cpp
index e7d89d265c0..5a815fa3316 100644
--- a/backends/platform/libretro/src/libretro-os-utils.cpp
+++ b/backends/platform/libretro/src/libretro-os-utils.cpp
@@ -122,7 +122,7 @@ int OSystem_libretro::testGame(const char *filedata, bool autodetect) {
 	PluginManager::instance().loadDetectionPlugin();
 
 	if (autodetect) {
-		Common::FSNode dir(data);
+		Common::FSNode dir = Common::FSNode(Common::Path(data));
 		Common::FSList files;
 		dir.getChildren(files, Common::FSNode::kListAll);
 
@@ -133,7 +133,7 @@ int OSystem_libretro::testGame(const char *filedata, bool autodetect) {
 
 	} else {
 
-		ConfMan.loadDefaultConfigFile(getDefaultConfigFileName().c_str());
+		ConfMan.loadDefaultConfigFile(getDefaultConfigFileName().toString().c_str());
 		if (ConfMan.hasGameDomain(data)) {
 			res = TEST_GAME_OK_TARGET_FOUND;
 		} else {