diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 88b5e1812b..edd27ad67e 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1010,10 +1010,10 @@ static int generic_action_ok_remap_file_save(const char *path, path_mkdir(directory); if(input_remapping_save_file(file)) - menu_display_msg_queue_push("Remap file saved successfully", + runloop_msg_queue_push("Remap file saved successfully", 1, 100, true); else - menu_display_msg_queue_push("Error saving remap file", + runloop_msg_queue_push("Error saving remap file", 1, 100, true); return 0; @@ -1537,7 +1537,7 @@ static int action_ok_option_create(const char *path, if (!rarch_game_options_validate(game_path, sizeof(game_path), true)) { - menu_display_msg_queue_push("Error saving core options file", + runloop_msg_queue_push("Error saving core options file", 1, 100, true); return 0; } @@ -1555,7 +1555,7 @@ static int action_ok_option_create(const char *path, if(config_file_write(conf, game_path)) { - menu_display_msg_queue_push("Core options file created successfully", + runloop_msg_queue_push("Core options file created successfully", 1, 100, true); strlcpy(system->game_options_path, game_path, sizeof(system->game_options_path)); } @@ -2140,7 +2140,7 @@ static int action_ok_video_resolution(const char *path, video_driver_set_video_mode(width, height, true); snprintf(msg, sizeof(msg),"Applying: %dx%d\n START to reset", width, height); - menu_display_msg_queue_push(msg, 1, 100, true); + runloop_msg_queue_push(msg, 1, 100, true); } return 0; diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c index c24a29a807..a3dab0b999 100644 --- a/menu/cbs/menu_cbs_start.c +++ b/menu/cbs/menu_cbs_start.c @@ -297,10 +297,10 @@ static int action_start_video_resolution(unsigned type, const char *label) if (video_driver_get_video_output_size(&width, &height)) { - char msg[PATH_MAX_LENGTH] = {0}; + char msg[PATH_MAX_LENGTH]; snprintf(msg, sizeof(msg),"Resetting to: %dx%d", width, height); - menu_display_msg_queue_push(msg, 1, 100, true); + runloop_msg_queue_push(msg, 1, 100, true); } return 0; diff --git a/menu/menu_content.c b/menu/menu_content.c index 3214ef0573..46efbddeca 100644 --- a/menu/menu_content.c +++ b/menu/menu_content.c @@ -126,14 +126,14 @@ static bool menu_content_load(void) if (!(main_load_content(0, NULL, NULL, menu_content_environment_get))) { snprintf(msg, sizeof(msg), "Failed to load %s.\n", name); - menu_display_msg_queue_push(msg, 1, 90, false); + runloop_msg_queue_push(msg, 1, 90, false); return false; } if (*fullpath) { snprintf(msg, sizeof(msg), "INFO - Loading %s ...", name); - menu_display_msg_queue_push(msg, 1, 1, false); + runloop_msg_queue_push(msg, 1, 1, false); } menu_driver_ctl(RARCH_MENU_CTL_SHADER_MANAGER_INIT, NULL); diff --git a/menu/menu_display.c b/menu/menu_display.c index 1e33fe5ed5..70063157b3 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -489,13 +489,6 @@ void menu_display_timedate(char *s, size_t len, unsigned time_mode) } } -void menu_display_msg_queue_push(const char *msg, - unsigned prio, unsigned duration, - bool flush) -{ - runloop_msg_queue_push(msg, prio, duration, flush); -} - void menu_display_matrix_4x4_rotate_z( math_matrix_4x4 *matrix, float rotation, float scale_x, float scale_y, float scale_z, diff --git a/menu/menu_display.h b/menu/menu_display.h index bd9eba2020..cbd3dcf4d9 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -148,11 +148,6 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data); void menu_display_timedate(char *s, size_t len, unsigned time_mode); -void menu_display_msg_queue_push(const char *msg, - unsigned prio, unsigned duration, - bool flush); - - void menu_display_draw(float x, float y, unsigned width, unsigned height, struct gfx_coords *coords, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 012c4c883b..533219c324 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2552,9 +2552,9 @@ static int setting_action_ok_bind_all_save_autoconfig(void *data, bool wraparoun index_offset = menu_setting_get_index_offset(setting); if(config_save_autoconf_profile(settings->input.device_names[index_offset], index_offset)) - menu_display_msg_queue_push("Autoconf file saved successfully", 1, 100, true); + runloop_msg_queue_push("Autoconf file saved successfully", 1, 100, true); else - menu_display_msg_queue_push("Error saving autoconf file", 1, 100, true); + runloop_msg_queue_push("Error saving autoconf file", 1, 100, true); return 0; }