mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make menu_input_frame_pointer part of menu_input_frame_retropad

Browse Source 
again
This commit is contained in:
twinaphex 2015-10-24 03:56:28 +02:00
parent 81cccd6f71
commit 257efd2899
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/menu_input.c
View File

@ -1203,9 +1203,9 @@ void menu_input_post_iterate(int *ret, unsigned action)
*ret |= menu_input_pointer_post_iterate(cbs, &entry, action); *ret |= menu_input_pointer_post_iterate(cbs, &entry, action);
} }
unsigned menu_input_frame_pointer(void) static unsigned menu_input_frame_pointer(unsigned *data)
{ {
unsigned ret = MENU_ACTION_NOOP; unsigned ret = *data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_input_t *menu_input = menu_input_get_ptr(); menu_input_t *menu_input = menu_input_get_ptr();
bool mouse_enabled = settings->menu.mouse.enable; bool mouse_enabled = settings->menu.mouse.enable;
@ -1341,5 +1341,5 @@ unsigned menu_input_frame_retropad(retro_input_t input, retro_input_t trigger_in
} }
#endif #endif
return ret; return menu_input_frame_pointer(&ret);
} }

2
menu/menu_input.h
View File

@ -124,8 +124,6 @@ void menu_input_st_string_callback(void *userdata, const char *str);
void menu_input_st_cheat_callback(void *userdata, const char *str); void menu_input_st_cheat_callback(void *userdata, const char *str);
unsigned menu_input_frame_pointer(void);
unsigned menu_input_frame_retropad(retro_input_t input, retro_input_t trigger_state, retro_input_t *devices_mask); unsigned menu_input_frame_retropad(retro_input_t input, retro_input_t trigger_state, retro_input_t *devices_mask);
void menu_input_post_iterate(int *ret, unsigned action); void menu_input_post_iterate(int *ret, unsigned action);

12
runloop.c
View File

@ -981,17 +981,7 @@ int rarch_main_iterate(unsigned *sleep_ms)
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (menu_driver_alive()) if (menu_driver_alive())
{ {
int ret2 = 0; if (menu_driver_iterate((enum menu_action)menu_input_frame_retropad(input, trigger_input, &devices)) == -1)
enum menu_action action = (enum menu_action)menu_input_frame_retropad(input, trigger_input, &devices);
/* Process RetroPad */
int ret = menu_driver_iterate(action);
action = (enum menu_action)menu_input_frame_pointer();
if (action != MENU_ACTION_NOOP)
ret2 = menu_driver_iterate(action);
if (ret == -1 || ret2 == -1)
rarch_ctl(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED, NULL); rarch_ctl(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED, NULL);
if (!input && settings->menu.pause_libretro) if (!input && settings->menu.pause_libretro)