ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename input_get_bind_string_* functions

This commit is contained in:
twinaphex 2015-11-28 16:06:14 +01:00
parent 814a7a174f
commit 68169f9ac3
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
input/input_config.c
View File

@ -348,7 +348,7 @@ void input_config_parse_joy_axis(config_file_t *conf, const char *prefix,
} }
} }
static void input_get_bind_string_joykey(char *buf, const char *prefix, static void input_config_get_bind_string_joykey(char *buf, const char *prefix,
const struct retro_keybind *bind, size_t size) const struct retro_keybind *bind, size_t size)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -391,7 +391,7 @@ static void input_get_bind_string_joykey(char *buf, const char *prefix,
} }
} }
static void input_get_bind_string_joyaxis(char *buf, const char *prefix, static void input_config_get_bind_string_joyaxis(char *buf, const char *prefix,
const struct retro_keybind *bind, size_t size) const struct retro_keybind *bind, size_t size)
{ {
unsigned axis = 0; unsigned axis = 0;
@ -414,7 +414,7 @@ static void input_get_bind_string_joyaxis(char *buf, const char *prefix,
snprintf(buf, size, "%s%c%u (axis) ", prefix, dir, axis); snprintf(buf, size, "%s%c%u (axis) ", prefix, dir, axis);
} }
void input_get_bind_string(char *buf, const struct retro_keybind *bind, void input_config_get_bind_string(char *buf, const struct retro_keybind *bind,
const struct retro_keybind *auto_bind, size_t size) const struct retro_keybind *auto_bind, size_t size)
{ {
char key[64] = {0}; char key[64] = {0};
@ -425,13 +425,13 @@ void input_get_bind_string(char *buf, const struct retro_keybind *bind,
*buf = '\0'; *buf = '\0';
if (bind->joykey != NO_BTN) if (bind->joykey != NO_BTN)
input_get_bind_string_joykey(buf, "", bind, size); input_config_get_bind_string_joykey(buf, "", bind, size);
else if (bind->joyaxis != AXIS_NONE) else if (bind->joyaxis != AXIS_NONE)
input_get_bind_string_joyaxis(buf, "", bind, size); input_config_get_bind_string_joyaxis(buf, "", bind, size);
else if (auto_bind && auto_bind->joykey != NO_BTN) else if (auto_bind && auto_bind->joykey != NO_BTN)
input_get_bind_string_joykey(buf, "Auto: ", auto_bind, size); input_config_get_bind_string_joykey(buf, "Auto: ", auto_bind, size);
else if (auto_bind && auto_bind->joyaxis != AXIS_NONE) else if (auto_bind && auto_bind->joyaxis != AXIS_NONE)
input_get_bind_string_joyaxis(buf, "Auto: ", auto_bind, size); input_config_get_bind_string_joyaxis(buf, "Auto: ", auto_bind, size);
#ifndef RARCH_CONSOLE #ifndef RARCH_CONSOLE
input_keymaps_translate_rk_to_str(bind->key, key, sizeof(key)); input_keymaps_translate_rk_to_str(bind->key, key, sizeof(key));

2
input/input_config.h
View File

@ -30,7 +30,7 @@ const char *input_config_bind_map_get_desc(unsigned i);
bool input_config_bind_map_get_valid(unsigned i); bool input_config_bind_map_get_valid(unsigned i);
/* auto_bind can be NULL. */ /* auto_bind can be NULL. */
void input_get_bind_string(char *buf, const struct retro_keybind *bind, void input_config_get_bind_string(char *buf, const struct retro_keybind *bind,
const struct retro_keybind *auto_bind, size_t size); const struct retro_keybind *auto_bind, size_t size);
/** /**

2
menu/drivers/menu_generic.c
View File

@ -98,7 +98,7 @@ static int action_iterate_help(char *s, size_t len, const char *label)
const struct retro_keybind *auto_bind = (const struct retro_keybind*) const struct retro_keybind *auto_bind = (const struct retro_keybind*)
input_get_auto_bind(0, binds[i]); input_get_auto_bind(0, binds[i]);
input_get_bind_string(desc[i], keybind, auto_bind, sizeof(desc[i])); input_config_get_bind_string(desc[i], keybind, auto_bind, sizeof(desc[i]));
} }
menu_hash_get_help(MENU_LABEL_VALUE_MENU_CONTROLS_PROLOG, menu_hash_get_help(MENU_LABEL_VALUE_MENU_CONTROLS_PROLOG,

2
menu/menu_setting.c
View File

@ -916,7 +916,7 @@ static void setting_get_string_representation_st_bind(void *data,
auto_bind = (const struct retro_keybind*) auto_bind = (const struct retro_keybind*)
input_get_auto_bind(index_offset, keybind->id); input_get_auto_bind(index_offset, keybind->id);
input_get_bind_string(s, keybind, auto_bind, len); input_config_get_bind_string(s, keybind, auto_bind, len);
} }
static void setting_get_string_representation_int(void *data, static void setting_get_string_representation_int(void *data,