diff --git a/menu/menu_defines.h b/menu/menu_defines.h index f419a016da..aedeef9178 100644 --- a/menu/menu_defines.h +++ b/menu/menu_defines.h @@ -212,13 +212,6 @@ enum menu_display_driver_type MENU_VIDEO_DRIVER_VGA }; -enum menu_toggle_reason -{ - MENU_TOGGLE_REASON_NONE = 0, - MENU_TOGGLE_REASON_USER, - MENU_TOGGLE_REASON_MESSAGE -}; - enum rgui_thumbnail_scaler { RGUI_THUMB_SCALE_POINT = 0, diff --git a/menu/menu_driver.c b/menu/menu_driver.c index e05c119e29..798120e5e8 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -175,9 +175,6 @@ uintptr_t menu_display_white_texture; static video_coord_array_t menu_disp_ca; -static enum -menu_toggle_reason menu_display_toggle_reason = MENU_TOGGLE_REASON_NONE; - /* Width, height and pitch of the menu framebuffer */ static unsigned menu_display_framebuf_width = 0; static unsigned menu_display_framebuf_height = 0; @@ -1545,16 +1542,6 @@ int menu_display_osk_ptr_at_pos(void *data, int x, int y, return -1; } -enum menu_toggle_reason menu_display_toggle_get_reason(void) -{ - return menu_display_toggle_reason; -} - -void menu_display_toggle_set_reason(enum menu_toggle_reason reason) -{ - menu_display_toggle_reason = reason; -} - /* Check if the current menu driver is compatible * with your video driver. */ static bool menu_display_check_compatibility( diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 1f9c773a98..ca37cfa752 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -551,9 +551,6 @@ size_t menu_navigation_get_selection(void); void menu_navigation_set_selection(size_t val); -enum menu_toggle_reason menu_display_toggle_get_reason(void); -void menu_display_toggle_set_reason(enum menu_toggle_reason reason); - void menu_display_blend_begin(video_frame_info_t *video_info); void menu_display_blend_end(video_frame_info_t *video_info); diff --git a/menu/widgets/menu_dialog.c b/menu/widgets/menu_dialog.c index b6fae2d490..636caa970d 100644 --- a/menu/widgets/menu_dialog.c +++ b/menu/widgets/menu_dialog.c @@ -290,8 +290,6 @@ void menu_dialog_reset(void) menu_dialog_current_id = 0; menu_dialog_current_type = MENU_DIALOG_NONE; menu_dialog_current_msg = MSG_UNKNOWN; - - menu_display_toggle_set_reason(MENU_TOGGLE_REASON_NONE); } void menu_dialog_show_message( @@ -299,9 +297,6 @@ void menu_dialog_show_message( { menu_dialog_current_msg = msg; - if (!menu_driver_is_toggled()) - menu_display_toggle_set_reason(MENU_TOGGLE_REASON_MESSAGE); - menu_dialog_push_pending(true, type); menu_dialog_push(); } diff --git a/retroarch.c b/retroarch.c index 2696779646..ee8fd2ca80 100644 --- a/retroarch.c +++ b/retroarch.c @@ -22018,9 +22018,6 @@ static void menu_driver_toggle(bool on) menu_driver_toggled = on; - if (!on) - menu_display_toggle_set_reason(MENU_TOGGLE_REASON_NONE); - if (menu_data->driver_ctx && menu_data->driver_ctx->toggle) menu_data->driver_ctx->toggle(menu_data->userdata, on); @@ -23753,7 +23750,6 @@ static enum runloop_state runloop_check_state(void) } else { - menu_display_toggle_set_reason(MENU_TOGGLE_REASON_USER); retroarch_menu_running(); } }