From 27611288c027ba43c30b645e6f39b235c8f20d01 Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Thu, 29 Dec 2022 02:13:31 +0100 Subject: [PATCH] Rename retroarch_get_current_savestate_path and retroarch_get_entry_state_path to runloop_{function_name} --- command.c | 5 +++-- gfx/drivers/ctr_gfx.c | 6 +++--- retroarch.c | 2 +- retroarch.h | 4 ---- runloop.c | 4 ++-- runloop.h | 4 ++++ 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/command.c b/command.c index 3af3a08736..86730aa2c9 100644 --- a/command.c +++ b/command.c @@ -61,6 +61,7 @@ #include "list_special.h" #include "paths.h" #include "retroarch.h" +#include "runloop.h" #include "verbosity.h" #include "version.h" #include "version_git.h" @@ -1226,7 +1227,7 @@ bool command_event_load_entry_state(void) entry_state_path[0] = '\0'; - if (!retroarch_get_entry_state_path( + if (!runloop_get_entry_state_path( entry_state_path, sizeof(entry_state_path), runloop_st->entry_state_slot)) return false; @@ -1613,7 +1614,7 @@ bool command_event_main_state(unsigned cmd) if (savestates_enabled) { - retroarch_get_current_savestate_path(state_path, + runloop_get_current_savestate_path(state_path, sizeof(state_path)); core_serialize_size(&info); diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c index c24811a6ea..c595108699 100644 --- a/gfx/drivers/ctr_gfx.c +++ b/gfx/drivers/ctr_gfx.c @@ -271,7 +271,7 @@ static const char *ctr_texture_path(unsigned id) static char texture_path[PATH_MAX_LENGTH]; char state_path[PATH_MAX_LENGTH]; - if (!retroarch_get_current_savestate_path(state_path, + if (!runloop_get_current_savestate_path(state_path, sizeof(state_path))) return NULL; @@ -313,7 +313,7 @@ static bool ctr_update_state_date_from_file(void *data) struct tm *t = NULL; ctr_video_t *ctr = (ctr_video_t*)data; - if (!retroarch_get_current_savestate_path( + if (!runloop_get_current_savestate_path( state_path, sizeof(state_path))) return false; @@ -450,7 +450,7 @@ static void save_state_to_file(void *data) { char state_path[PATH_MAX_LENGTH]; ctr_video_t *ctr = (ctr_video_t*)data; - retroarch_get_current_savestate_path(state_path, sizeof(state_path)); + runloop_get_current_savestate_path(state_path, sizeof(state_path)); command_event(CMD_EVENT_RAM_STATE_TO_FILE, state_path); } diff --git a/retroarch.c b/retroarch.c index b7373dc833..9eda157e03 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1221,7 +1221,7 @@ static void ram_state_to_file(void) state_path[0] = '\0'; - if (retroarch_get_current_savestate_path(state_path, sizeof(state_path))) + if (runloop_get_current_savestate_path(state_path, sizeof(state_path))) command_event(CMD_EVENT_RAM_STATE_TO_FILE, state_path); } diff --git a/retroarch.h b/retroarch.h index 37b20542de..a2e2fb901e 100644 --- a/retroarch.h +++ b/retroarch.h @@ -209,10 +209,6 @@ enum rarch_state_flags RARCH_FLAGS_BLOCK_CONFIG_READ = (1 << 13) }; -bool retroarch_get_current_savestate_path(char *path, size_t len); - -bool retroarch_get_entry_state_path(char *path, size_t len, unsigned slot); - /** * retroarch_fail: * @error_code : Error code. diff --git a/runloop.c b/runloop.c index c4866152f7..45a6f168a1 100644 --- a/runloop.c +++ b/runloop.c @@ -8227,7 +8227,7 @@ void runloop_task_msg_queue_push( runloop_msg_queue_push(msg, prio, duration, flush, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); } -bool retroarch_get_current_savestate_path(char *path, size_t len) +bool runloop_get_current_savestate_path(char *path, size_t len) { runloop_state_t *runloop_st = &runloop_state; settings_t *settings = config_get_ptr(); @@ -8251,7 +8251,7 @@ bool retroarch_get_current_savestate_path(char *path, size_t len) return true; } -bool retroarch_get_entry_state_path(char *path, size_t len, unsigned slot) +bool runloop_get_entry_state_path(char *path, size_t len, unsigned slot) { size_t _len; runloop_state_t *runloop_st = &runloop_state; diff --git a/runloop.h b/runloop.h index 67ab607e14..3646737d59 100644 --- a/runloop.h +++ b/runloop.h @@ -442,6 +442,10 @@ void runloop_path_set_names(void); uint32_t runloop_get_flags(void); +bool runloop_get_entry_state_path(char *path, size_t len, unsigned slot); + +bool runloop_get_current_savestate_path(char *path, size_t len); + void runloop_state_free(runloop_state_t *runloop_st); runloop_state_t *runloop_state_get_ptr(void);