From 67e76285685607f76e7331ac755e98376e022549 Mon Sep 17 00:00:00 2001 From: Themaister Date: Wed, 8 Jan 2014 18:23:58 +0100 Subject: [PATCH] Rename input_find_sk_key. Matches up better with the conventions in input_common. The sk-prefix was from SSNES days (how things linger on ... D:) --- input/input_common.c | 8 ++++---- input/input_common.h | 2 +- input/overlay.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/input/input_common.c b/input/input_common.c index 2960a410e5..2fb83a201e 100644 --- a/input/input_common.c +++ b/input/input_common.c @@ -992,7 +992,7 @@ const struct input_key_map input_config_key_map[] = { { NULL, RETROK_UNKNOWN }, }; -static enum retro_key find_sk_bind(const char *str) +static enum retro_key find_rk_bind(const char *str) { size_t i; for (i = 0; input_config_key_map[i].str; i++) @@ -1005,12 +1005,12 @@ static enum retro_key find_sk_bind(const char *str) return RETROK_UNKNOWN; } -enum retro_key input_find_sk_key(const char *str) +enum retro_key input_translate_str_to_rk(const char *str) { if (strlen(str) == 1 && isalpha(*str)) return (enum retro_key)(RETROK_a + (tolower(*str) - (int)'a')); else - return find_sk_bind(str); + return find_rk_bind(str); } void input_config_parse_key(config_file_t *conf, const char *prefix, const char *btn, @@ -1021,7 +1021,7 @@ void input_config_parse_key(config_file_t *conf, const char *prefix, const char snprintf(key, sizeof(key), "%s_%s", prefix, btn); if (config_get_array(conf, key, tmp, sizeof(tmp))) - bind->key = input_find_sk_key(tmp); + bind->key = input_translate_str_to_rk(tmp); } const char *input_config_get_prefix(unsigned player, bool meta) diff --git a/input/input_common.h b/input/input_common.h index aae4571a1b..e31b2d38e6 100644 --- a/input/input_common.h +++ b/input/input_common.h @@ -150,12 +150,12 @@ struct input_key_map }; extern const struct input_key_map input_config_key_map[]; void input_translate_rk_to_str(enum retro_key key, char *buf, size_t size); +enum retro_key input_translate_str_to_rk(const char *str); extern const char* const input_builtin_autoconfs[]; const char *input_config_get_prefix(unsigned player, bool meta); unsigned input_translate_str_to_bind_id(const char *str); // Returns RARCH_BIND_LIST_END on not found. -enum retro_key input_find_sk_key(const char *str); void input_config_parse_key(config_file_t *conf, const char *prefix, const char *btn, diff --git a/input/overlay.c b/input/overlay.c index a23218674e..bae349ce2c 100644 --- a/input/overlay.c +++ b/input/overlay.c @@ -249,7 +249,7 @@ static bool input_overlay_load_desc(input_overlay_t *ol, config_file_t *conf, st else if (strstr(key, "retrok_") == key) { desc->type = OVERLAY_TYPE_KEYBOARD; - desc->key_mask = input_find_sk_key(key + 7); + desc->key_mask = input_translate_str_to_rk(key + 7); } else {