From 8c74be08796813fb93ed9e831e8b3b23b3ed634c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 23 Oct 2015 09:01:57 +0200 Subject: [PATCH] Rename menu_input_frame to menu_input_frame_retropad --- menu/menu_input.c | 2 +- menu/menu_input.h | 2 +- runloop.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/menu/menu_input.c b/menu/menu_input.c index 5db8d578f2..3a641ed000 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -1206,7 +1206,7 @@ void menu_input_post_iterate(int *ret, unsigned action) *ret |= menu_input_pointer_post_iterate(cbs, &entry, action); } -unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input, retro_input_t *devices) +unsigned menu_input_frame_retropad(retro_input_t input, retro_input_t trigger_input, retro_input_t *devices) { bool mouse_enabled; float delta_time; diff --git a/menu/menu_input.h b/menu/menu_input.h index d1d433e22e..6c6af5cd57 100644 --- a/menu/menu_input.h +++ b/menu/menu_input.h @@ -118,7 +118,7 @@ void menu_input_st_string_callback(void *userdata, const char *str); void menu_input_st_cheat_callback(void *userdata, const char *str); -unsigned menu_input_frame(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); diff --git a/runloop.c b/runloop.c index d850e19a63..fdd9e63ac5 100644 --- a/runloop.c +++ b/runloop.c @@ -981,7 +981,7 @@ int rarch_main_iterate(unsigned *sleep_ms) #ifdef HAVE_MENU if (menu_driver_alive()) { - if (menu_driver_iterate((enum menu_action)menu_input_frame(input, trigger_input, &devices)) == -1) + if (menu_driver_iterate((enum menu_action)menu_input_frame_retropad(input, trigger_input, &devices)) == -1) rarch_ctl(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED, NULL); if (!input && settings->menu.pause_libretro)