libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-01-24 18:36:31 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

fix defaults

Browse Source
This commit is contained in:
radius 2017-09-10 11:57:07 -05:00
parent 3c9651ace0
commit 9abbf47a8d
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configuration.c
View File

@ -1242,7 +1242,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
SETTING_BOOL("network_remote_enable", &settings->bools.network_remote_enable, false, false /* TODO */, false); SETTING_BOOL("network_remote_enable", &settings->bools.network_remote_enable, false, false /* TODO */, false);
#endif #endif
#ifdef HAVE_KEYMAPPER #ifdef HAVE_KEYMAPPER
SETTING_BOOL("keyboard_mapper_enable", &settings->bools.keyboard_mapper_enable, false, false /* TODO */, false); SETTING_BOOL("keymapper_enable", &settings->bools.keymapper_enable, true, true /* TODO */, false);
#endif #endif
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
SETTING_BOOL("netplay_nat_traversal", &settings->bools.netplay_nat_traversal, true, true, false); SETTING_BOOL("netplay_nat_traversal", &settings->bools.netplay_nat_traversal, true, true, false);
@ -1347,7 +1347,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
SETTING_UINT("network_remote_base_port", &settings->uints.network_remote_base_port, true, network_remote_base_port, false); SETTING_UINT("network_remote_base_port", &settings->uints.network_remote_base_port, true, network_remote_base_port, false);
#endif #endif
#ifdef HAVE_KEYMAPPER #ifdef HAVE_KEYMAPPER
SETTING_UINT("keyboard_mapper_port", &settings->uints.keyboard_mapper_port, true, network_remote_base_port, false); SETTING_UINT("keymapper_port", &settings->uints.keymapper_port, true, 0, false);
#endif #endif
#ifdef GEKKO #ifdef GEKKO
SETTING_UINT("video_viwidth", &settings->uints.video_viwidth, true, video_viwidth, false); SETTING_UINT("video_viwidth", &settings->uints.video_viwidth, true, video_viwidth, false);

4
configuration.h
View File

@ -199,7 +199,7 @@ typedef struct settings
bool savestate_thumbnail_enable; bool savestate_thumbnail_enable;
bool network_cmd_enable; bool network_cmd_enable;
bool stdin_cmd_enable; bool stdin_cmd_enable;
bool keyboard_mapper_enable; bool keymapper_enable;
bool network_remote_enable; bool network_remote_enable;
bool network_remote_enable_user[MAX_USERS]; bool network_remote_enable_user[MAX_USERS];
bool load_dummy_on_core_shutdown; bool load_dummy_on_core_shutdown;
@ -305,7 +305,7 @@ typedef struct settings
unsigned autosave_interval; unsigned autosave_interval;
unsigned network_cmd_port; unsigned network_cmd_port;
unsigned network_remote_base_port; unsigned network_remote_base_port;
unsigned keyboard_mapper_port; unsigned keymapper_port;
unsigned video_window_x; unsigned video_window_x;
unsigned video_window_y; unsigned video_window_y;
unsigned video_monitor_index; unsigned video_monitor_index;

4
input/input_driver.c
View File

@ -1378,11 +1378,11 @@ bool input_driver_init_mapper(void)
#ifdef HAVE_KEYMAPPER #ifdef HAVE_KEYMAPPER
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!settings->bools.keyboard_mapper_enable) if (!settings->bools.keymapper_enable)
return false; return false;
input_driver_mapper = input_mapper_new( input_driver_mapper = input_mapper_new(
settings->uints.keyboard_mapper_port); settings->uints.keymapper_port);
if (input_driver_mapper) if (input_driver_mapper)
return true; return true;

4
input/input_remapping.c
View File

@ -84,7 +84,7 @@ bool input_remapping_load_file(void *data, const char *path)
key_remap = -1; key_remap = -1;
if (settings->uints.keyboard_mapper_port == i) if (settings->uints.keymapper_port == i)
{ {
if (config_get_int(conf, keymapper_ident[j], &key_remap)) if (config_get_int(conf, keymapper_ident[j], &key_remap))
{ {
@ -200,7 +200,7 @@ bool input_remapping_save_file(const char *path)
else else
config_unset(conf,key_ident[j]); config_unset(conf,key_ident[j]);
if (settings->uints.keyboard_mapper_port == i && if (settings->uints.keymapper_port == i &&
settings->uints.input_keymapper_ids[j] != RETROK_UNKNOWN) settings->uints.input_keymapper_ids[j] != RETROK_UNKNOWN)
config_set_int(conf, keymapper_ident[j], settings->uints.input_keymapper_ids[j]); config_set_int(conf, keymapper_ident[j], settings->uints.input_keymapper_ids[j]);
} }

2
menu/menu_displaylist.c
View File

@ -3510,7 +3510,7 @@ static int menu_displaylist_parse_options_remappings(
for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++) for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
{ {
char desc_label[64]; char desc_label[64];
unsigned user = settings->uints.keyboard_mapper_port + 1; unsigned user = settings->uints.keymapper_port + 1;
unsigned desc_offset = retro_id; unsigned desc_offset = retro_id;
const char *description = NULL; const char *description = NULL;