libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-07 10:21:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LIBRETRO: add osd_notification

Browse Source
This commit is contained in:
Giovanni Cascione 2023-05-10 22:44:03 +02:00
parent 20ce78d889
commit 3590bb387c
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backends/platform/libretro/src/libretro-os.cpp
View File

@ -70,6 +70,12 @@
extern retro_log_printf_t log_cb;
extern bool timing_inaccuracies_is_enabled(void);
extern bool consecutive_screen_updates_is_enabled(void);
extern void reset_performance_tuner(void);
extern void retro_osd_notification(const char* msg);
extern float frame_rate;
#include "common/mutex.h"
/**
@ -319,11 +325,6 @@ static Common::String s_saveDir;
Common::List<Common::Event> _events;
extern bool timing_inaccuracies_is_enabled(void);
extern bool consecutive_screen_updates_is_enabled(void);
extern void reset_performance_tuner(void);
extern float frame_rate;
class OSystem_RETRO : public EventsBaseBackend, public PaletteManager {
public:
Graphics::Surface _screen;

43
backends/platform/libretro/src/libretro.cpp
View File

@ -188,14 +188,21 @@ void reset_performance_tuner() {
}
}
static void update_variables(void) {
struct retro_variable var;
void retro_osd_notification(const char* msg) {
if (!msg || *msg == '\0')
return;
struct retro_message_ext retro_msg;
retro_msg.type = RETRO_MESSAGE_TYPE_NOTIFICATION;
retro_msg.target = RETRO_MESSAGE_TARGET_OSD;
retro_msg.duration = 3000;
retro_msg.msg = "";
retro_msg.msg = msg;
environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &retro_msg);
}
static void update_variables(void) {
struct retro_variable var;
const char* osd_msg = "";
var.key = "scummvm_gamepad_cursor_speed";
var.value = NULL;
@ -288,15 +295,13 @@ static void update_variables(void) {
if (!(audio_status & AUDIO_STATUS_BUFFER_SUPPORT)) {
if (frameskip_type > 1) {
log_cb(RETRO_LOG_WARN, "Selected frameskip mode not available.\n");
retro_msg.msg = "Selected frameskip mode not available";
environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &retro_msg);
retro_osd_notification("Selected frameskip mode not available");
frameskip_type = 0;
}
if (performance_switch) {
log_cb(RETRO_LOG_WARN, "Auto performance tuner not available.\n");
retro_msg.msg = "Auto performance tuner not available";
environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &retro_msg);
retro_osd_notification("Auto performance tuner not available");
performance_switch = 0;
}
}
@ -304,8 +309,6 @@ static void update_variables(void) {
if (old_frameskip_type != frameskip_type) {
audio_status |= AUDIO_STATUS_UPDATE_LATENCY;
}
}
bool timing_inaccuracies_is_enabled(){
@ -333,6 +336,8 @@ void parse_command_params(char *cmdline) {
int cmdlen = strlen(cmdline);
bool quotes = false;
if (!cmdlen) return;
/* Append a new line to the end of the command to signify it's finished. */
cmdline[cmdlen] = '\n';
cmdline[++cmdlen] = '\0';
@ -616,15 +621,9 @@ bool retro_load_game(const struct retro_game_info *game) {
Common::FSNode detect_target = Common::FSNode(game->path);
Common::FSNode parent_dir = detect_target.getParent();
char target_id[400] = {0};
char buffer[400];
char buffer[400] = {0};
int test_game_status = TEST_GAME_KO_NOT_FOUND;
struct retro_message_ext retro_msg;
retro_msg.type = RETRO_MESSAGE_TYPE_NOTIFICATION;
retro_msg.target = RETRO_MESSAGE_TARGET_OSD;
retro_msg.duration = 3000;
retro_msg.msg = "";
const char *target_file_ext = ".scummvm";
int target_file_ext_pos = strlen(game->path) - strlen(target_file_ext);
@ -685,19 +684,15 @@ bool retro_load_game(const struct retro_game_info *game) {
break;
case TEST_GAME_KO_MULTIPLE_RESULTS:
log_cb(RETRO_LOG_WARN, "[scummvm] Multiple targets found for '%s' in scummvm.ini\n", target_id);
retro_msg.msg = "Multiple targets found";
retro_osd_notification("Multiple targets found");
break;
case TEST_GAME_KO_NOT_FOUND:
default:
log_cb(RETRO_LOG_WARN, "[scummvm] Game not found. Check path and content of '%s'\n", game->path);
retro_msg.msg = "Game not found";
retro_osd_notification("Game not found");
}
if (retro_msg.msg[0] != '\0') {
environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &retro_msg);
} else {
parse_command_params(buffer);
}
parse_command_params(buffer);
} else {
game_buf_ptr = NULL;
}