From d905986a52aff0a7131a9a2044941d0df340f059 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 20 Jul 2019 12:43:43 +0200 Subject: [PATCH] Rename functions - change rarch_ prefix to retroarch_ --- command.c | 6 +++--- discord/discord.c | 4 ++-- gfx/drivers/gl.c | 4 ++-- gfx/drivers/gl_core.c | 4 ++-- menu/cbs/menu_cbs_ok.c | 2 +- network/netplay/netplay_handshake.c | 4 ++-- retroarch.c | 16 ++++++++-------- retroarch.h | 6 +++--- tasks/task_content.c | 14 +++++++------- ui/drivers/ui_cocoatouch.m | 4 ++-- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/command.c b/command.c index e750dd2574..dc0ce5a561 100644 --- a/command.c +++ b/command.c @@ -1923,9 +1923,9 @@ bool command_event(enum event_command cmd, void *data) case CMD_EVENT_MENU_TOGGLE: #ifdef HAVE_MENU if (menu_driver_is_alive()) - rarch_menu_running_finished(false); + retroarch_menu_running_finished(false); else - rarch_menu_running(); + retroarch_menu_running(); #endif break; case CMD_EVENT_CONTROLLERS_INIT: @@ -2421,7 +2421,7 @@ TODO: Add a setting for these tweaks */ #endif break; case CMD_EVENT_RESUME: - rarch_menu_running_finished(false); + retroarch_menu_running_finished(false); if (ui_companion_is_on_foreground()) ui_companion_driver_toggle(false); break; diff --git a/discord/discord.c b/discord/discord.c index b24fe6e09a..6c0a6354c0 100644 --- a/discord/discord.c +++ b/discord/discord.c @@ -261,7 +261,7 @@ static void handle_discord_join_response(void *ignore, const char *line) #ifdef HAVE_MENU menu_input_dialog_end(); - rarch_menu_running_finished(false); + retroarch_menu_running_finished(false); #endif */ } @@ -286,7 +286,7 @@ static void handle_discord_join_request(const DiscordUser* request) #ifdef HAVE_MENU discord_download_avatar(request->userId, request->avatar); /* To-Do: needs in-game widgets - rarch_menu_running(); + retroarch_menu_running(); */ memset(&line, 0, sizeof(line)); diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index e8bc51e87c..2fc9a6575c 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -3743,9 +3743,9 @@ static void *gl2_init(const video_info_t *video, if (string_is_equal(vendor, "Microsoft Corporation")) if (string_is_equal(renderer, "GDI Generic")) #ifdef HAVE_OPENGL1 - rarch_force_video_driver_fallback("gl1"); + retroarch_force_video_driver_fallback("gl1"); #else - rarch_force_video_driver_fallback("gdi"); + retroarch_force_video_driver_fallback("gdi"); #endif #endif diff --git a/gfx/drivers/gl_core.c b/gfx/drivers/gl_core.c index 181f0ae1cc..577ad894ff 100644 --- a/gfx/drivers/gl_core.c +++ b/gfx/drivers/gl_core.c @@ -1048,9 +1048,9 @@ static void *gl_core_init(const video_info_t *video, if (string_is_equal(vendor, "Microsoft Corporation")) if (string_is_equal(renderer, "GDI Generic")) #ifdef HAVE_OPENGL1 - rarch_force_video_driver_fallback("gl1"); + retroarch_force_video_driver_fallback("gl1"); #else - rarch_force_video_driver_fallback("gdi"); + retroarch_force_video_driver_fallback("gdi"); #endif #endif diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index b95bc75d64..71815395b6 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -5589,7 +5589,7 @@ static void action_ok_netplay_enable_client_hostname_cb( } menu_input_dialog_end(); - rarch_menu_running_finished(false); + retroarch_menu_running_finished(false); } #endif diff --git a/network/netplay/netplay_handshake.c b/network/netplay/netplay_handshake.c index f550884b7c..1895956271 100644 --- a/network/netplay/netplay_handshake.c +++ b/network/netplay/netplay_handshake.c @@ -295,7 +295,7 @@ static void handshake_password(void *ignore, const char *line) #ifdef HAVE_MENU menu_input_dialog_end(); - rarch_menu_running_finished(false); + retroarch_menu_running_finished(false); #endif } #endif @@ -420,7 +420,7 @@ bool netplay_handshake_init(netplay_t *netplay, { #ifdef HAVE_MENU menu_input_ctx_line_t line; - rarch_menu_running(); + retroarch_menu_running(); #endif handshake_password_netplay = netplay; diff --git a/retroarch.c b/retroarch.c index 533fa105ef..c3017e2764 100644 --- a/retroarch.c +++ b/retroarch.c @@ -18657,7 +18657,7 @@ bool retroarch_is_on_main_thread(void) return true; } -void rarch_menu_running(void) +void retroarch_menu_running(void) { #if defined(HAVE_MENU) || defined(HAVE_OVERLAY) settings_t *settings = configuration_settings; @@ -18680,7 +18680,7 @@ void rarch_menu_running(void) #endif } -void rarch_menu_running_finished(bool quit) +void retroarch_menu_running_finished(bool quit) { #if defined(HAVE_MENU) || defined(HAVE_OVERLAY) settings_t *settings = configuration_settings; @@ -19743,7 +19743,7 @@ bool retroarch_main_quit(void) } rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL); - rarch_menu_running_finished(true); + retroarch_menu_running_finished(true); return true; } @@ -20235,7 +20235,7 @@ static enum runloop_state runloop_check_state( } if (!menu_driver_iterate(&iter)) - rarch_menu_running_finished(false); + retroarch_menu_running_finished(false); if (focused || !runloop_idle) { @@ -20319,7 +20319,7 @@ static enum runloop_state runloop_check_state( { if (rarch_is_initialized && !core_type_is_dummy) { - rarch_menu_running_finished(false); + retroarch_menu_running_finished(false); menu_event_kb_set(false, RETROK_F1); } } @@ -20331,12 +20331,12 @@ static enum runloop_state runloop_check_state( if (menu_driver_is_alive()) { if (rarch_is_initialized && !core_type_is_dummy) - rarch_menu_running_finished(false); + retroarch_menu_running_finished(false); } else { menu_display_toggle_set_reason(MENU_TOGGLE_REASON_USER); - rarch_menu_running(); + retroarch_menu_running(); } } else @@ -21023,7 +21023,7 @@ char *get_retroarch_launch_arguments(void) return launch_arguments; } -void rarch_force_video_driver_fallback(const char *driver) +void retroarch_force_video_driver_fallback(const char *driver) { settings_t *settings = configuration_settings; ui_msg_window_t *msg_window = NULL; diff --git a/retroarch.h b/retroarch.h index e0f597835e..816c6260d2 100644 --- a/retroarch.h +++ b/retroarch.h @@ -391,9 +391,9 @@ void runloop_set(enum runloop_action action); void runloop_unset(enum runloop_action action); -void rarch_menu_running(void); +void retroarch_menu_running(void); -void rarch_menu_running_finished(bool quit); +void retroarch_menu_running_finished(bool quit); bool retroarch_is_on_main_thread(void); @@ -403,7 +403,7 @@ rarch_system_info_t *runloop_get_system_info(void); struct retro_system_info *runloop_get_libretro_system_info(void); -void rarch_force_video_driver_fallback(const char *driver); +void retroarch_force_video_driver_fallback(const char *driver); void rarch_core_runtime_tick(void); diff --git a/tasks/task_content.c b/tasks/task_content.c index 9067741005..013279a482 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -1684,7 +1684,7 @@ bool task_push_load_content_from_playlist_from_menu( free(error_string); } - rarch_menu_running(); + retroarch_menu_running(); ret = false; goto end; @@ -1700,7 +1700,7 @@ bool task_push_load_content_from_playlist_from_menu( #endif #else rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL); - rarch_menu_running_finished(true); + retroarch_menu_running_finished(true); #endif end: @@ -1785,7 +1785,7 @@ bool task_push_start_current_core(content_ctx_info_t *content_info) free(error_string); } - rarch_menu_running(); + retroarch_menu_running(); ret = false; goto end; @@ -1911,7 +1911,7 @@ bool task_push_load_content_with_new_core_from_menu( free(error_string); } - rarch_menu_running(); + retroarch_menu_running(); ret = false; goto end; @@ -2128,7 +2128,7 @@ bool task_push_start_builtin_core( /* Load content */ if (!task_load_content_callback(content_info, true, false)) { - rarch_menu_running(); + retroarch_menu_running(); return false; } @@ -2174,7 +2174,7 @@ bool task_push_load_content_with_core_from_menu( /* Load content */ if (!task_load_content_callback(content_info, true, false)) { - rarch_menu_running(); + retroarch_menu_running(); return false; } @@ -2199,7 +2199,7 @@ bool task_push_load_subsystem_with_core_from_menu( /* Load content */ if (!task_load_content_callback(content_info, true, false)) { - rarch_menu_running(); + retroarch_menu_running(); return false; } diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index fd2d3a2409..0d7da67532 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -56,7 +56,7 @@ static void rarch_enable_ui(void) rarch_ctl(RARCH_CTL_SET_PAUSED, &boolean); rarch_ctl(RARCH_CTL_SET_IDLE, &boolean); - rarch_menu_running(); + retroarch_menu_running(); } static void rarch_disable_ui(void) @@ -67,7 +67,7 @@ static void rarch_disable_ui(void) rarch_ctl(RARCH_CTL_SET_PAUSED, &boolean); rarch_ctl(RARCH_CTL_SET_IDLE, &boolean); - rarch_menu_running_finished(false); + retroarch_menu_running_finished(false); } static void ui_companion_cocoatouch_event_command(