retroarch.h functions should be namespaced 'retroarch_' instead

of 'rarch_'
This commit is contained in:
libretroadmin 2023-01-22 16:58:22 +01:00
parent 539c47faa3
commit 378e90e745
9 changed files with 23 additions and 25 deletions

View File

@ -5948,16 +5948,15 @@ void input_config_parse_joy_button(
} }
} }
void rarch_config_deinit(void) void retroarch_config_deinit(void)
{ {
if (config_st) if (config_st)
free(config_st); free(config_st);
config_st = NULL; config_st = NULL;
} }
void rarch_config_init(void) void retroarch_config_init(void)
{ {
if (config_st) if (!config_st)
return; config_st = (settings_t*)calloc(1, sizeof(settings_t));
config_st = (settings_t*)calloc(1, sizeof(settings_t));
} }

View File

@ -1158,9 +1158,9 @@ void config_load_file_salamander(void);
void config_save_file_salamander(void); void config_save_file_salamander(void);
#endif #endif
void rarch_config_init(void); void retroarch_config_init(void);
void rarch_config_deinit(void); void retroarch_config_deinit(void);
settings_t *config_get_ptr(void); settings_t *config_get_ptr(void);

View File

@ -2781,16 +2781,15 @@ enum retro_language frontend_unix_get_user_language(void)
if (jstr) if (jstr)
{ {
const char *lang_str = (*env)->GetStringUTFChars(env, jstr, 0); const char *lang_str = (*env)->GetStringUTFChars(env, jstr, 0);
lang = rarch_get_language_from_iso(lang_str); lang = retroarch_get_language_from_iso(lang_str);
(*env)->ReleaseStringUTFChars(env, jstr, lang_str); (*env)->ReleaseStringUTFChars(env, jstr, lang_str);
} }
} }
#else #else
char *envvar = getenv("LANG"); char *envvar = getenv("LANG");
if (envvar) if (envvar)
lang = rarch_get_language_from_iso(envvar); return retroarch_get_language_from_iso(envvar);
#endif #endif
#endif #endif
return lang; return lang;

View File

@ -7126,7 +7126,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
menu_st->entries.begin = 0; menu_st->entries.begin = 0;
command_event(CMD_EVENT_HISTORY_DEINIT, NULL); command_event(CMD_EVENT_HISTORY_DEINIT, NULL);
rarch_favorites_deinit(); retroarch_favorites_deinit();
menu_st->dialog_st.pending_push = false; menu_st->dialog_st.pending_push = false;
menu_st->dialog_st.current_id = 0; menu_st->dialog_st.current_id = 0;

View File

@ -8502,8 +8502,8 @@ static void general_write_handler(rarch_setting_t *setting)
/* In all cases, need to close and reopen /* In all cases, need to close and reopen
* playlist file (to update maximum capacity) */ * playlist file (to update maximum capacity) */
rarch_favorites_deinit(); retroarch_favorites_deinit();
rarch_favorites_init(); retroarch_favorites_init();
} }
} }
break; break;

View File

@ -4436,7 +4436,7 @@ void main_exit(void *args)
task_queue_deinit(); task_queue_deinit();
ui_companion_driver_deinit(); ui_companion_driver_deinit();
rarch_config_deinit(); retroarch_config_deinit();
frontend_driver_shutdown(false); frontend_driver_shutdown(false);
@ -4510,9 +4510,9 @@ int rarch_main(int argc, char *argv[], void *data)
libretro_free_system_info(&runloop_st->system.info); libretro_free_system_info(&runloop_st->system.info);
command_event(CMD_EVENT_HISTORY_DEINIT, NULL); command_event(CMD_EVENT_HISTORY_DEINIT, NULL);
rarch_favorites_deinit(); retroarch_favorites_deinit();
rarch_config_init(); retroarch_config_init();
retroarch_deinit_drivers(&runloop_st->retro_ctx); retroarch_deinit_drivers(&runloop_st->retro_ctx);
retroarch_ctl(RARCH_CTL_STATE_FREE, NULL); retroarch_ctl(RARCH_CTL_STATE_FREE, NULL);
@ -6933,7 +6933,7 @@ bool retroarch_main_quit(void)
return true; return true;
} }
enum retro_language rarch_get_language_from_iso(const char *iso639) enum retro_language retroarch_get_language_from_iso(const char *iso639)
{ {
unsigned i; unsigned i;
enum retro_language lang = RETRO_LANGUAGE_ENGLISH; enum retro_language lang = RETRO_LANGUAGE_ENGLISH;
@ -6999,7 +6999,7 @@ enum retro_language rarch_get_language_from_iso(const char *iso639)
return lang; return lang;
} }
void rarch_favorites_init(void) void retroarch_favorites_init(void)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
int content_favorites_size = settings ? settings->ints.content_favorites_size : 0; int content_favorites_size = settings ? settings->ints.content_favorites_size : 0;
@ -7020,7 +7020,7 @@ void rarch_favorites_init(void)
if (content_favorites_size >= 0) if (content_favorites_size >= 0)
playlist_config.capacity = (size_t)content_favorites_size; playlist_config.capacity = (size_t)content_favorites_size;
rarch_favorites_deinit(); retroarch_favorites_deinit();
RARCH_LOG("[Playlist]: %s: \"%s\".\n", RARCH_LOG("[Playlist]: %s: \"%s\".\n",
msg_hash_to_str(MSG_LOADING_FAVORITES_FILE), msg_hash_to_str(MSG_LOADING_FAVORITES_FILE),
@ -7038,7 +7038,7 @@ void rarch_favorites_init(void)
playlist_qsort(g_defaults.content_favorites); playlist_qsort(g_defaults.content_favorites);
} }
void rarch_favorites_deinit(void) void retroarch_favorites_deinit(void)
{ {
if (!g_defaults.content_favorites) if (!g_defaults.content_favorites)
return; return;

View File

@ -124,11 +124,11 @@ void retroarch_menu_running(void);
void retroarch_menu_running_finished(bool quit); void retroarch_menu_running_finished(bool quit);
enum retro_language rarch_get_language_from_iso(const char *lang); enum retro_language retroarch_get_language_from_iso(const char *lang);
void rarch_favorites_init(void); void retroarch_favorites_init(void);
void rarch_favorites_deinit(void); void retroarch_favorites_deinit(void);
/* Audio */ /* Audio */

View File

@ -1482,7 +1482,7 @@ static bool content_load(content_ctx_info_t *info,
#endif #endif
command_event(CMD_EVENT_HISTORY_INIT, NULL); command_event(CMD_EVENT_HISTORY_INIT, NULL);
rarch_favorites_init(); retroarch_favorites_init();
command_event(CMD_EVENT_RESUME, NULL); command_event(CMD_EVENT_RESUME, NULL);
command_event(CMD_EVENT_VIDEO_SET_ASPECT_RATIO, NULL); command_event(CMD_EVENT_VIDEO_SET_ASPECT_RATIO, NULL);

View File

@ -1095,7 +1095,7 @@ extern "C" {
sizeof(lang_iso)); sizeof(lang_iso));
} }
string_list_deinitialize(&split); string_list_deinitialize(&split);
return rarch_get_language_from_iso(lang_iso); return retroarch_get_language_from_iso(lang_iso);
} }
const char* uwp_get_cpu_model_name(void) const char* uwp_get_cpu_model_name(void)