diff --git a/input/input_config.c b/input/input_config.c index 1deb2881ce..eb23dd496b 100644 --- a/input/input_config.c +++ b/input/input_config.c @@ -182,7 +182,7 @@ void input_config_parse_key(config_file_t *conf, fill_pathname_join_delim(key, prefix, btn, '_', sizeof(key)); if (config_get_array(conf, key, tmp, sizeof(tmp))) - bind->key = input_translate_str_to_rk(tmp); + bind->key = input_config_translate_str_to_rk(tmp); } const char *input_config_get_prefix(unsigned user, bool meta) @@ -212,14 +212,14 @@ static enum retro_key find_rk_bind(const char *str) } /** - * input_translate_str_to_rk: + * input_config_translate_str_to_rk: * @str : String to translate to key ID. * * Translates tring representation to key identifier. * * Returns: key identifier. **/ -enum retro_key input_translate_str_to_rk(const char *str) +enum retro_key input_config_translate_str_to_rk(const char *str) { if (strlen(str) == 1 && isalpha((int)*str)) return (enum retro_key)(RETROK_a + (tolower((int)*str) - (int)'a')); @@ -227,14 +227,14 @@ enum retro_key input_translate_str_to_rk(const char *str) } /** - * input_translate_str_to_bind_id: + * input_config_translate_str_to_bind_id: * @str : String to translate to bind ID. * * Translate string representation to bind ID. * * Returns: Bind ID value on success, otherwise RARCH_BIND_LIST_END on not found. **/ -unsigned input_translate_str_to_bind_id(const char *str) +unsigned input_config_translate_str_to_bind_id(const char *str) { unsigned i; diff --git a/input/input_config.h b/input/input_config.h index 7e3ce3b341..5f3408619a 100644 --- a/input/input_config.h +++ b/input/input_config.h @@ -34,26 +34,26 @@ void input_get_bind_string(char *buf, const struct retro_keybind *bind, const struct retro_keybind *auto_bind, size_t size); /** - * input_translate_str_to_rk: + * input_config_translate_str_to_rk: * @str : String to translate to key ID. * * Translates tring representation to key identifier. * * Returns: key identifier. **/ -enum retro_key input_translate_str_to_rk(const char *str); +enum retro_key input_config_translate_str_to_rk(const char *str); const char *input_config_get_prefix(unsigned user, bool meta); /** - * input_translate_str_to_bind_id: + * input_config_translate_str_to_bind_id: * @str : String to translate to bind ID. * * Translate string representation to bind ID. * * Returns: Bind ID value on success, otherwise RARCH_BIND_LIST_END on not found. **/ -unsigned input_translate_str_to_bind_id(const char *str); +unsigned input_config_translate_str_to_bind_id(const char *str); void input_config_parse_key(config_file_t *conf, const char *prefix, const char *btn, diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c index 4d7b28bf2c..551f5ccaf0 100644 --- a/tasks/task_overlay.c +++ b/tasks/task_overlay.c @@ -172,7 +172,7 @@ static bool rarch_task_overlay_load_desc( if (strstr(key, "retrok_") == key) { desc->type = OVERLAY_TYPE_KEYBOARD; - desc->key_mask = input_translate_str_to_rk(key + 7); + desc->key_mask = input_config_translate_str_to_rk(key + 7); } else { @@ -182,7 +182,7 @@ static bool rarch_task_overlay_load_desc( for (tmp = strtok_r(key, "|", &save); tmp; tmp = strtok_r(NULL, "|", &save)) { if (strcmp(tmp, "nul") != 0) - desc->key_mask |= UINT64_C(1) << input_translate_str_to_bind_id(tmp); + desc->key_mask |= UINT64_C(1) << input_config_translate_str_to_bind_id(tmp); } if (desc->key_mask & (UINT64_C(1) << RARCH_OVERLAY_NEXT))