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

Not sure what perform_action was doing here

Browse Source
This commit is contained in:
twinaphex 2015-08-17 15:44:57 +02:00
parent cd1875ceb4
commit 4f1bb7b9b6
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
menu/menu_driver.h
View File

@ -141,7 +141,6 @@ typedef struct menu_ctx_driver
const char *ident;
menu_video_driver_type_t type;
int (*environ_cb)(menu_environ_cb_t type, void *data);
bool (*perform_action)(void* data, unsigned action);
} menu_ctx_driver_t;
extern menu_ctx_driver_t menu_ctx_rmenu;

9
menu/menu_input.c
View File

@ -945,7 +945,7 @@ void menu_input_post_iterate(int *ret, unsigned action)
unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
{
unsigned ret = 0;
unsigned ret = MENU_ACTION_NOOP;
static bool initial_held = true;
static bool first_held = false;
static const retro_input_t input_repeat =
@ -1033,8 +1033,6 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
ret = MENU_ACTION_INFO;
else if (trigger_input & (UINT64_C(1) << RARCH_MENU_TOGGLE))
ret = MENU_ACTION_TOGGLE;
else
ret = MENU_ACTION_NOOP;
if (settings->menu.mouse.enable)
menu_input_mouse(&ret);
@ -1042,10 +1040,5 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
if (settings->menu.pointer.enable)
menu_input_pointer(&ret);
if (trigger_input &&
menu_ctx_driver_get_ptr()->perform_action &&
menu_ctx_driver_get_ptr()->perform_action(menu->userdata, ret))
return MENU_ACTION_NOOP;
return ret;
}