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

(Menu) Refactor MENU_SETTINGS_INPUT_OPTIONS

Browse Source
This commit is contained in:
twinaphex 2014-09-04 18:46:29 +02:00
parent a0d32b50ae
commit 56d59d3bcf
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/disp/shared.h
View File

@ -15,7 +15,7 @@ static void get_title(const char *label, const char *dir,
snprintf(title, sizeof_title, "DISK APPEND %s", dir);
else if (menu_type == MENU_SETTINGS_VIDEO_OPTIONS)
strlcpy(title, "VIDEO OPTIONS", sizeof_title);
else if (menu_type == MENU_SETTINGS_INPUT_OPTIONS ||
else if (!strcmp(label, "Input Options") ||
menu_type == MENU_SETTINGS_CUSTOM_BIND ||
menu_type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD)
strlcpy(title, "INPUT OPTIONS", sizeof_title);

2
frontend/menu/menu_common.c
View File

@ -664,7 +664,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
!strcmp(label, "performance_counters") ||
!strcmp(label, "frontend_counters") ||
!strcmp(label, "core_counters") ||
type == MENU_SETTINGS_INPUT_OPTIONS
!strcmp(label, "Input Options")
)
return MENU_SETTINGS;

1
frontend/menu/menu_common.h
View File

@ -108,7 +108,6 @@ typedef enum
// settings options are done here too
MENU_SETTINGS_CONFIG,
MENU_SETTINGS_INPUT_OPTIONS,
MENU_SETTINGS_PATH_OPTIONS,
MENU_SETTINGS_OPTIONS,
MENU_SETTINGS_DRIVERS,

51
frontend/menu/menu_entries.c
View File

@ -357,6 +357,31 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"audio_volume", 0, setting_data);
add_setting_entry(menu,list,"audio_device", 0, setting_data);
}
else if (!strcmp(label, "Input Options"))
{
file_list_clear(list);
file_list_push(list, "Player", "",
MENU_SETTINGS_BIND_PLAYER, 0);
file_list_push(list, "Device", "",
MENU_SETTINGS_BIND_DEVICE, 0);
file_list_push(list, "Device Type", "",
MENU_SETTINGS_BIND_DEVICE_TYPE, 0);
file_list_push(list, "Analog D-pad Mode", "",
MENU_SETTINGS_BIND_ANALOG_MODE, 0);
add_setting_entry(menu,list,"input_axis_threshold", 0, setting_data);
add_setting_entry(menu,list,"input_autodetect_enable", 0, setting_data);
file_list_push(list, "Bind Mode", "",
MENU_SETTINGS_CUSTOM_BIND_MODE, 0);
file_list_push(list, "Configure All (RetroPad)", "",
MENU_SETTINGS_CUSTOM_BIND_ALL, 0);
file_list_push(list, "Default All (RetroPad)", "",
MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, 0);
add_setting_entry(menu,list,"osk_enable", 0, setting_data);
for (i = MENU_SETTINGS_BIND_BEGIN; i <= MENU_SETTINGS_BIND_ALL_LAST; i++)
file_list_push(list,
input_config_bind_map[i - MENU_SETTINGS_BIND_BEGIN].desc,
"", i, 0);
}
else
{
switch (menu_type)
@ -466,7 +491,7 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"Shader Options", MENU_SETTINGS_SHADER_OPTIONS, setting_data);
add_setting_entry(menu,list,"Font Options", MENU_SETTINGS_FONT_OPTIONS, setting_data);
add_setting_entry(menu,list,"Audio Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Input Options", MENU_SETTINGS_INPUT_OPTIONS, setting_data);
add_setting_entry(menu,list,"Input Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Overlay Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"User Options", MENU_FILE_SWITCH, setting_data);
add_setting_entry(menu,list,"Netplay Options", MENU_FILE_SWITCH, setting_data);
@ -507,30 +532,6 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"joypad_autoconfig_dir", 0, setting_data);
add_setting_entry(menu,list,"extraction_directory", 0, setting_data);
break;
case MENU_SETTINGS_INPUT_OPTIONS:
file_list_clear(list);
file_list_push(list, "Player", "",
MENU_SETTINGS_BIND_PLAYER, 0);
file_list_push(list, "Device", "",
MENU_SETTINGS_BIND_DEVICE, 0);
file_list_push(list, "Device Type", "",
MENU_SETTINGS_BIND_DEVICE_TYPE, 0);
file_list_push(list, "Analog D-pad Mode", "",
MENU_SETTINGS_BIND_ANALOG_MODE, 0);
add_setting_entry(menu,list,"input_axis_threshold", 0, setting_data);
add_setting_entry(menu,list,"input_autodetect_enable", 0, setting_data);
file_list_push(list, "Bind Mode", "",
MENU_SETTINGS_CUSTOM_BIND_MODE, 0);
file_list_push(list, "Configure All (RetroPad)", "",
MENU_SETTINGS_CUSTOM_BIND_ALL, 0);
file_list_push(list, "Default All (RetroPad)", "",
MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL, 0);
add_setting_entry(menu,list,"osk_enable", 0, setting_data);
for (i = MENU_SETTINGS_BIND_BEGIN; i <= MENU_SETTINGS_BIND_ALL_LAST; i++)
file_list_push(list,
input_config_bind_map[i - MENU_SETTINGS_BIND_BEGIN].desc,
"", i, 0);
break;
case MENU_SETTINGS_DRIVERS:
file_list_clear(list);
add_setting_entry(menu,list,"video_driver", 0, setting_data);