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

Rename functions to fit input_config_ naming convention

This commit is contained in:
twinaphex 2015-11-28 02:13:27 +01:00
parent 28e035ec6b
commit 70d782b94a
7 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
configuration.c
View File

@ -1058,17 +1058,17 @@ static void read_keybinds_keyboard(config_file_t *conf, unsigned user,
{ {
const char *prefix = NULL; const char *prefix = NULL;
if (!input_bind_map_get_valid(idx)) if (!input_config_bind_map_get_valid(idx))
return; return;
if (!input_bind_map_get_base(idx)) if (!input_config_bind_map_get_base(idx))
return; return;
prefix = input_config_get_prefix(user, input_bind_map_get_meta(idx)); prefix = input_config_get_prefix(user, input_config_bind_map_get_meta(idx));
if (prefix) if (prefix)
input_config_parse_key(conf, prefix, input_config_parse_key(conf, prefix,
input_bind_map_get_base(idx), bind); input_config_bind_map_get_base(idx), bind);
} }
static void read_keybinds_button(config_file_t *conf, unsigned user, static void read_keybinds_button(config_file_t *conf, unsigned user,
@ -1076,17 +1076,17 @@ static void read_keybinds_button(config_file_t *conf, unsigned user,
{ {
const char *prefix = NULL; const char *prefix = NULL;
if (!input_bind_map_get_valid(idx)) if (!input_config_bind_map_get_valid(idx))
return; return;
if (!input_bind_map_get_base(idx)) if (!input_config_bind_map_get_base(idx))
return; return;
prefix = input_config_get_prefix(user, prefix = input_config_get_prefix(user,
input_bind_map_get_meta(idx)); input_config_bind_map_get_meta(idx));
if (prefix) if (prefix)
input_config_parse_joy_button(conf, prefix, input_config_parse_joy_button(conf, prefix,
input_bind_map_get_base(idx), bind); input_config_bind_map_get_base(idx), bind);
} }
static void read_keybinds_axis(config_file_t *conf, unsigned user, static void read_keybinds_axis(config_file_t *conf, unsigned user,
@ -1094,17 +1094,17 @@ static void read_keybinds_axis(config_file_t *conf, unsigned user,
{ {
const char *prefix = NULL; const char *prefix = NULL;
if (!input_bind_map_get_valid(idx)) if (!input_config_bind_map_get_valid(idx))
return; return;
if (!input_bind_map_get_base(idx)) if (!input_config_bind_map_get_base(idx))
return; return;
prefix = input_config_get_prefix(user, prefix = input_config_get_prefix(user,
input_bind_map_get_meta(idx)); input_config_bind_map_get_meta(idx));
if (prefix) if (prefix)
input_config_parse_joy_axis(conf, prefix, input_config_parse_joy_axis(conf, prefix,
input_bind_map_get_base(idx), bind); input_config_bind_map_get_base(idx), bind);
} }
static void read_keybinds_user(config_file_t *conf, unsigned user) static void read_keybinds_user(config_file_t *conf, unsigned user)
@ -1112,7 +1112,7 @@ static void read_keybinds_user(config_file_t *conf, unsigned user)
unsigned i; unsigned i;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
for (i = 0; input_bind_map_get_valid(i); i++) for (i = 0; input_config_bind_map_get_valid(i); i++)
{ {
struct retro_keybind *bind = (struct retro_keybind*) struct retro_keybind *bind = (struct retro_keybind*)
&settings->input.binds[user][i]; &settings->input.binds[user][i];
@ -2299,13 +2299,13 @@ static void save_keybinds_user(config_file_t *conf, unsigned user)
unsigned i = 0; unsigned i = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
for (i = 0; input_bind_map_get_valid(i); i++) for (i = 0; input_config_bind_map_get_valid(i); i++)
{ {
const char *prefix = input_config_get_prefix(user, const char *prefix = input_config_get_prefix(user,
input_bind_map_get_meta(i)); input_config_bind_map_get_meta(i));
if (prefix) if (prefix)
save_keybind(conf, prefix, input_bind_map_get_base(i), save_keybind(conf, prefix, input_config_bind_map_get_base(i),
&settings->input.binds[user][i], true, true); &settings->input.binds[user][i], true, true);
} }
} }
@ -2421,7 +2421,7 @@ bool config_save_autoconf_profile(const char *path, unsigned user)
for (i = 0; i < RARCH_FIRST_META_KEY; i++) for (i = 0; i < RARCH_FIRST_META_KEY; i++)
{ {
save_keybind(conf, "input", input_bind_map_get_base(i), save_keybind(conf, "input", input_config_bind_map_get_base(i),
&settings->input.binds[user][i], false, false); &settings->input.binds[user][i], false, false);
} }
ret = config_file_write(conf, autoconf_file); ret = config_file_write(conf, autoconf_file);

4
input/input_autodetect.c
View File

@ -60,9 +60,9 @@ static void input_autoconfigure_joypad_conf(config_file_t *conf,
for (i = 0; i < RARCH_BIND_LIST_END; i++) for (i = 0; i < RARCH_BIND_LIST_END; i++)
{ {
input_config_parse_joy_button(conf, "input", input_config_parse_joy_button(conf, "input",
input_bind_map_get_base(i), &binds[i]); input_config_bind_map_get_base(i), &binds[i]);
input_config_parse_joy_axis(conf, "input", input_config_parse_joy_axis(conf, "input",
input_bind_map_get_base(i), &binds[i]); input_config_bind_map_get_base(i), &binds[i]);
} }
} }

18
input/input_common.c
View File

@ -133,7 +133,7 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
#endif #endif
}; };
static const void *input_bind_map_get(unsigned i) static const void *input_config_bind_map_get(unsigned i)
{ {
const struct input_bind_map* keybind = (const struct input_bind_map*)&input_config_bind_map[i]; const struct input_bind_map* keybind = (const struct input_bind_map*)&input_config_bind_map[i];
if (!keybind) if (!keybind)
@ -141,33 +141,33 @@ static const void *input_bind_map_get(unsigned i)
return keybind; return keybind;
} }
bool input_bind_map_get_valid(unsigned i) bool input_config_bind_map_get_valid(unsigned i)
{ {
const struct input_bind_map* keybind = (const struct input_bind_map*)input_bind_map_get(i); const struct input_bind_map* keybind = (const struct input_bind_map*)input_config_bind_map_get(i);
if (!keybind) if (!keybind)
return false; return false;
return keybind->valid; return keybind->valid;
} }
unsigned input_bind_map_get_meta(unsigned i) unsigned input_config_bind_map_get_meta(unsigned i)
{ {
const struct input_bind_map* keybind = (const struct input_bind_map*)input_bind_map_get(i); const struct input_bind_map* keybind = (const struct input_bind_map*)input_config_bind_map_get(i);
if (!keybind) if (!keybind)
return 0; return 0;
return keybind->meta; return keybind->meta;
} }
const char *input_bind_map_get_base(unsigned i) const char *input_config_bind_map_get_base(unsigned i)
{ {
const struct input_bind_map* keybind = (const struct input_bind_map*)input_bind_map_get(i); const struct input_bind_map* keybind = (const struct input_bind_map*)input_config_bind_map_get(i);
if (!keybind) if (!keybind)
return NULL; return NULL;
return keybind->base; return keybind->base;
} }
const char *input_bind_map_get_desc(unsigned i) const char *input_config_bind_map_get_desc(unsigned i)
{ {
const struct input_bind_map* keybind = (const struct input_bind_map*)input_bind_map_get(i); const struct input_bind_map* keybind = (const struct input_bind_map*)input_config_bind_map_get(i);
if (!keybind) if (!keybind)
return NULL; return NULL;
return keybind->desc; return keybind->desc;

8
input/input_common.h
View File

@ -21,13 +21,13 @@
#include <stdint.h> #include <stdint.h>
#include "../driver.h" #include "../driver.h"
const char *input_bind_map_get_base(unsigned i); const char *input_config_bind_map_get_base(unsigned i);
unsigned input_bind_map_get_meta(unsigned i); unsigned input_config_bind_map_get_meta(unsigned i);
const char *input_bind_map_get_desc(unsigned i); const char *input_config_bind_map_get_desc(unsigned i);
bool input_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_get_bind_string(char *buf, const struct retro_keybind *bind,

2
menu/menu_displaylist.c
View File

@ -2624,7 +2624,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
for (i = 0; i < RARCH_BIND_LIST_END; i++) for (i = 0; i < RARCH_BIND_LIST_END; i++)
{ {
ret = menu_displaylist_parse_settings(menu, info, ret = menu_displaylist_parse_settings(menu, info,
input_bind_map_get_base(i), PARSE_ONLY_BIND, false); input_config_bind_map_get_base(i), PARSE_ONLY_BIND, false);
(void)ret; (void)ret;
} }
} }

2
menu/menu_input.c
View File

@ -735,7 +735,7 @@ int menu_input_key_bind_iterate(char *s, size_t len)
snprintf(s, len, snprintf(s, len,
"[%s]\npress keyboard or joypad\n(timeout %d %s)", "[%s]\npress keyboard or joypad\n(timeout %d %s)",
input_bind_map_get_desc( input_config_bind_map_get_desc(
menu_input->binds.begin - MENU_SETTINGS_BIND_BEGIN), menu_input->binds.begin - MENU_SETTINGS_BIND_BEGIN),
timeout, timeout,
menu_hash_to_str(MENU_VALUE_SECONDS)); menu_hash_to_str(MENU_VALUE_SECONDS));

12
menu/menu_setting.c
View File

@ -3162,7 +3162,7 @@ static bool setting_append_list_input_player_options(
char name[PATH_MAX_LENGTH]; char name[PATH_MAX_LENGTH];
bool do_add = true; bool do_add = true;
if (!input_bind_map_get_meta(i)) if (!input_config_bind_map_get_meta(i))
continue; continue;
strlcpy(label, buffer[user], sizeof(label)); strlcpy(label, buffer[user], sizeof(label));
@ -3188,9 +3188,9 @@ static bool setting_append_list_input_player_options(
} }
} }
else else
strlcat(label, input_bind_map_get_desc(i), sizeof(label)); strlcat(label, input_config_bind_map_get_desc(i), sizeof(label));
snprintf(name, sizeof(name), "p%u_%s", user + 1, input_bind_map_get_base(i)); snprintf(name, sizeof(name), "p%u_%s", user + 1, input_config_bind_map_get_base(i));
if (do_add) if (do_add)
{ {
@ -5101,14 +5101,14 @@ static bool setting_append_list_input_hotkey_options(
for (i = 0; i < RARCH_BIND_LIST_END; i ++) for (i = 0; i < RARCH_BIND_LIST_END; i ++)
{ {
if (!input_bind_map_get_meta(i)) if (!input_config_bind_map_get_meta(i))
continue; continue;
CONFIG_BIND( CONFIG_BIND(
list, list_info, list, list_info,
&settings->input.binds[0][i], 0, 0, &settings->input.binds[0][i], 0, 0,
strdup(input_bind_map_get_base(i)), strdup(input_config_bind_map_get_base(i)),
strdup(input_bind_map_get_desc(i)), strdup(input_config_bind_map_get_desc(i)),
&retro_keybinds_1[i], &retro_keybinds_1[i],
&group_info, &subgroup_info, parent_group); &group_info, &subgroup_info, parent_group);
(*list)[list_info->index - 1].bind_type = i + MENU_SETTINGS_BIND_BEGIN; (*list)[list_info->index - 1].bind_type = i + MENU_SETTINGS_BIND_BEGIN;