mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Create menu_refresh"

Browse Source 
This reverts commit 7baa41422d30902bb55d1253a6a0c7848fc0cf1a.
This commit is contained in:
twinaphex 2015-05-15 18:05:52 +02:00
parent 7baa41422d
commit dd7d1493a6
5 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
menu/menu.c
View File

@ -258,21 +258,6 @@ void menu_free(menu_handle_t *menu)
free(menu);
}
int menu_refresh(void)
{
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu->need_refresh)
return -1;
if (menu->nonblocking_refresh)
return -1;
if (menu->input.joypad == MENU_ACTION_MESSAGE)
return -1;
menu_entry_iterate(MENU_ACTION_REFRESH);
return 0;
}
/**
* menu_iterate:
* @input : input sample for this frame
@ -290,6 +275,7 @@ int menu_iterate(retro_input_t input,
static retro_time_t last_clock_update = 0;
int32_t ret = 0;
unsigned action = 0;
runloop_t *runloop = rarch_main_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr();
@ -311,8 +297,16 @@ int menu_iterate(retro_input_t input,
action = menu->input.joypad;
if (menu->need_refresh && !menu->nonblocking_refresh && action != MENU_ACTION_MESSAGE)
action = MENU_ACTION_REFRESH;
menu_entry_iterate(action);
if (runloop->is_menu && !runloop->is_idle)
menu_display_fb();
menu_driver_set_texture();
if (ret)
return -1;

2
menu/menu.h
View File

@ -154,8 +154,6 @@ typedef enum
**/
void *menu_init(const void *data);
int menu_refresh(void);
/**
* menu_iterate:
* @input : input sample for this frame

10
menu/menu_display.c
View File

@ -206,13 +206,3 @@ void menu_display_unset_viewport(void)
video_driver_set_viewport(global->video_data.width,
global->video_data.height, false, true);
}
void menu_display_frame(void)
{
runloop_t *runloop = rarch_main_get_ptr();
if (runloop->is_menu && !runloop->is_idle)
menu_display_fb();
menu_driver_set_texture();
}

2
menu/menu_display.h
View File

@ -54,8 +54,6 @@ void menu_display_set_viewport(void);
void menu_display_unset_viewport(void);
void menu_display_frame(void);
#ifdef __cplusplus
}
#endif

18
runloop.c
View File

@ -29,7 +29,6 @@
#ifdef HAVE_MENU
#include "menu/menu.h"
#include "menu/menu_display.h"
#endif
#ifdef HAVE_NETPLAY
@ -1114,20 +1113,15 @@ int rarch_main_iterate(void)
rarch_main_data_iterate();
#ifdef HAVE_MENU
if (menu_refresh() == -1)
{
if (runloop->is_menu)
{
if (menu_iterate(input, old_input, trigger_input) == -1)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
}
}
if (runloop->is_menu)
{
menu_handle_t *menu = menu_driver_get_ptr();
if (menu)
if (menu_iterate(input, old_input, trigger_input) == -1)
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
if (!input && settings->menu.pause_libretro)
ret = 1;
menu_display_frame();
ret = 1;
goto success;
}
#endif