From 9cf699b9c878f57f5b25cc5a27156493db806bc7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Oct 2015 15:44:36 +0200 Subject: [PATCH] Namespace another function --- menu/menu_input.c | 2 +- menu/menu_input.h | 4 ++-- menu/menu_setting.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/menu/menu_input.c b/menu/menu_input.c index 02eccbccf1..58ffbe2e7e 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -675,7 +675,7 @@ int menu_input_key_bind_set_keyboard_mode(void *data, return menu_input_set_timeout(); } -int menu_input_set_input_device_bind_mode(void *data, +int menu_input_key_bind_set_device_mode(void *data, enum menu_input_bind_mode type) { unsigned index_offset; diff --git a/menu/menu_input.h b/menu/menu_input.h index e86e3e5542..9a4291fb6e 100644 --- a/menu/menu_input.h +++ b/menu/menu_input.h @@ -109,6 +109,8 @@ int menu_input_key_bind_iterate(char *s, size_t len); int menu_input_key_bind_set_keyboard_mode(void *data, enum menu_input_bind_mode type); +int menu_input_key_bind_set_device_mode(void *data, enum menu_input_bind_mode type); + void menu_input_st_uint_callback(void *userdata, const char *str); void menu_input_st_hex_callback(void *userdata, const char *str); @@ -120,8 +122,6 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_state); void menu_input_post_iterate(int *ret, unsigned action); -int menu_input_set_input_device_bind_mode(void *data, enum menu_input_bind_mode type); - int16_t menu_input_pointer_state(enum menu_input_pointer_state state); int16_t menu_input_mouse_state(enum menu_input_mouse_state state); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 276f7920ea..59bf888507 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -1431,7 +1431,7 @@ static int setting_action_ok_bind_all(void *data, bool wraparound) if (global->menu.bind_mode_keyboard) menu_input_key_bind_set_keyboard_mode(data, MENU_INPUT_BIND_ALL); else - menu_input_set_input_device_bind_mode(data, MENU_INPUT_BIND_ALL); + menu_input_key_bind_set_device_mode(data, MENU_INPUT_BIND_ALL); return 0; } @@ -1578,7 +1578,7 @@ static int setting_bind_action_ok(void *data, bool wraparound) if (global->menu.bind_mode_keyboard) menu_input_key_bind_set_keyboard_mode(data, MENU_INPUT_BIND_SINGLE); else - menu_input_set_input_device_bind_mode(data, MENU_INPUT_BIND_SINGLE); + menu_input_key_bind_set_device_mode(data, MENU_INPUT_BIND_SINGLE); return 0; }