mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-22 16:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turn settings->input.binds into static struct inside input_config.c

Browse Source
This commit is contained in:
twinaphex 2017-04-25 18:54:01 +02:00
parent 53c9acacd6
commit 5f9f43929a
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configuration.h
View File

@ -278,7 +278,6 @@ typedef struct settings
char device_names[MAX_USERS][64]; char device_names[MAX_USERS][64];
unsigned remap_ids[MAX_USERS][RARCH_BIND_LIST_END]; unsigned remap_ids[MAX_USERS][RARCH_BIND_LIST_END];
struct retro_keybind binds[MAX_USERS][RARCH_BIND_LIST_END];
unsigned max_users; unsigned max_users;

16
input/input_config.c
View File

@ -81,6 +81,8 @@ static const char *bind_user_prefix[MAX_USERS] = {
static int input_config_vid[MAX_USERS]; static int input_config_vid[MAX_USERS];
static int input_config_pid[MAX_USERS]; static int input_config_pid[MAX_USERS];
static struct retro_keybind input_config_binds[MAX_USERS][RARCH_BIND_LIST_END];
#define DECLARE_BIND(x, bind, desc) { true, 0, #x, desc, bind } #define DECLARE_BIND(x, bind, desc) { true, 0, #x, desc, bind }
#define DECLARE_META_BIND(level, x, bind, desc) { true, level, #x, desc, bind } #define DECLARE_META_BIND(level, x, bind, desc) { true, level, #x, desc, bind }
@ -152,20 +154,17 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
struct retro_keybind *input_config_get_specific_bind_ptr(unsigned i, unsigned j) struct retro_keybind *input_config_get_specific_bind_ptr(unsigned i, unsigned j)
{ {
settings_t *settings = config_get_ptr(); return (struct retro_keybind*)&input_config_binds[i][j];
return (struct retro_keybind*)&settings->input.binds[i][j];
} }
const struct retro_keybind *input_config_get_specific_bind(unsigned i, unsigned j) const struct retro_keybind *input_config_get_specific_bind(unsigned i, unsigned j)
{ {
settings_t *settings = config_get_ptr(); return &input_config_binds[i][j];
return &settings->input.binds[i][j];
} }
struct retro_keybind *input_config_get_binds(unsigned i) struct retro_keybind *input_config_get_binds(unsigned i)
{ {
settings_t *settings = config_get_ptr(); return input_config_binds[i];
return settings->input.binds[i];
} }
static const void *input_config_bind_map_get(unsigned i) static const void *input_config_bind_map_get(unsigned i)
@ -592,10 +591,9 @@ int32_t input_config_get_vid(unsigned port)
void input_config_reset(void) void input_config_reset(void)
{ {
unsigned i; unsigned i;
settings_t *settings = config_get_ptr();
retro_assert(sizeof(settings->input.binds[0]) >= sizeof(retro_keybinds_1)); retro_assert(sizeof(input_config_binds[0]) >= sizeof(retro_keybinds_1));
retro_assert(sizeof(settings->input.binds[1]) >= sizeof(retro_keybinds_rest)); retro_assert(sizeof(input_config_binds[1]) >= sizeof(retro_keybinds_rest));
memcpy(input_config_get_binds(0), retro_keybinds_1, sizeof(retro_keybinds_1)); memcpy(input_config_get_binds(0), retro_keybinds_1, sizeof(retro_keybinds_1));