(Settings data) Create new category 'Menu Options'
This commit is contained in:
parent
9d52362940
commit
ae6c8fa7fb
|
@ -389,6 +389,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
|
||||||
!strcmp(label, "Audio Options") ||
|
!strcmp(label, "Audio Options") ||
|
||||||
!strcmp(label, "disk_options") ||
|
!strcmp(label, "disk_options") ||
|
||||||
!strcmp(label, "Path Options") ||
|
!strcmp(label, "Path Options") ||
|
||||||
|
!strcmp(label, "Menu Options") ||
|
||||||
!strcmp(label, "Privacy Options") ||
|
!strcmp(label, "Privacy Options") ||
|
||||||
!strcmp(label, "Overlay Options") ||
|
!strcmp(label, "Overlay Options") ||
|
||||||
!strcmp(label, "User Options") ||
|
!strcmp(label, "User Options") ||
|
||||||
|
|
|
@ -204,6 +204,7 @@ int menu_entries_push_list(menu_handle_t *menu,
|
||||||
!strcmp(label, "Overlay Options") ||
|
!strcmp(label, "Overlay Options") ||
|
||||||
!strcmp(label, "Privacy Options") ||
|
!strcmp(label, "Privacy Options") ||
|
||||||
!strcmp(label, "Video Options") ||
|
!strcmp(label, "Video Options") ||
|
||||||
|
!strcmp(label, "Menu Options") ||
|
||||||
!strcmp(label, "Audio Options") ||
|
!strcmp(label, "Audio Options") ||
|
||||||
!strcmp(label, "Path Options") ||
|
!strcmp(label, "Path Options") ||
|
||||||
!strcmp(label, "Font Options") ||
|
!strcmp(label, "Font Options") ||
|
||||||
|
|
|
@ -263,6 +263,7 @@ struct settings
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
char driver[32];
|
char driver[32];
|
||||||
|
bool pause_libretro;
|
||||||
} menu;
|
} menu;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -379,6 +379,7 @@ void config_set_defaults(void)
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
g_settings.menu_show_start_screen = menu_show_start_screen;
|
g_settings.menu_show_start_screen = menu_show_start_screen;
|
||||||
|
g_settings.menu.pause_libretro = true;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
g_settings.location.allow = false;
|
g_settings.location.allow = false;
|
||||||
|
@ -899,6 +900,10 @@ bool config_load_file(const char *path, bool set_defaults)
|
||||||
CONFIG_GET_BOOL(video.vsync, "video_vsync");
|
CONFIG_GET_BOOL(video.vsync, "video_vsync");
|
||||||
CONFIG_GET_BOOL(video.hard_sync, "video_hard_sync");
|
CONFIG_GET_BOOL(video.hard_sync, "video_hard_sync");
|
||||||
|
|
||||||
|
#ifdef HAVE_MENU
|
||||||
|
CONFIG_GET_BOOL(menu.pause_libretro, "menu_pause_libretro");
|
||||||
|
#endif
|
||||||
|
|
||||||
CONFIG_GET_INT(video.hard_sync_frames, "video_hard_sync_frames");
|
CONFIG_GET_INT(video.hard_sync_frames, "video_hard_sync_frames");
|
||||||
if (g_settings.video.hard_sync_frames > 3)
|
if (g_settings.video.hard_sync_frames > 3)
|
||||||
g_settings.video.hard_sync_frames = 3;
|
g_settings.video.hard_sync_frames = 3;
|
||||||
|
@ -1472,6 +1477,7 @@ bool config_save_file(const char *path)
|
||||||
config_set_string(conf,"video_driver", g_settings.video.driver);
|
config_set_string(conf,"video_driver", g_settings.video.driver);
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
config_set_string(conf,"menu_driver", g_settings.menu.driver);
|
config_set_string(conf,"menu_driver", g_settings.menu.driver);
|
||||||
|
config_set_bool(conf,"menu_pause_libretro", g_settings.menu.pause_libretro);
|
||||||
#endif
|
#endif
|
||||||
config_set_bool(conf, "video_vsync", g_settings.video.vsync);
|
config_set_bool(conf, "video_vsync", g_settings.video.vsync);
|
||||||
config_set_bool(conf, "video_hard_sync", g_settings.video.hard_sync);
|
config_set_bool(conf, "video_hard_sync", g_settings.video.hard_sync);
|
||||||
|
|
|
@ -2591,13 +2591,20 @@ rarch_setting_t *setting_data_get_list(void)
|
||||||
END_GROUP()
|
END_GROUP()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_MENU
|
||||||
|
START_GROUP("Menu Options")
|
||||||
|
START_SUB_GROUP("State", GROUP_NAME)
|
||||||
|
CONFIG_BOOL(g_settings.menu_show_start_screen, "rgui_show_start_screen", "Show Start Screen", menu_show_start_screen, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
|
||||||
|
CONFIG_BOOL(g_settings.menu.pause_libretro, "menu_pause_libretro", "Pause Libretro", true, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
|
||||||
|
END_SUB_GROUP()
|
||||||
|
END_GROUP()
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_NETPLAY
|
#ifdef HAVE_NETPLAY
|
||||||
START_GROUP("Netplay Options")
|
START_GROUP("Netplay Options")
|
||||||
START_SUB_GROUP("State", GROUP_NAME)
|
START_SUB_GROUP("State", GROUP_NAME)
|
||||||
CONFIG_BOOL(g_extern.netplay_enable, "netplay_enable", "Netplay Enable", false, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
|
CONFIG_BOOL(g_extern.netplay_enable, "netplay_enable", "Netplay Enable", false, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
|
||||||
#ifdef HAVE_NETPLAY
|
|
||||||
CONFIG_STRING(g_extern.netplay_server, "netplay_ip_address", "IP Address", "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_FLAGS(SD_FLAG_ALLOW_INPUT)
|
CONFIG_STRING(g_extern.netplay_server, "netplay_ip_address", "IP Address", "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_FLAGS(SD_FLAG_ALLOW_INPUT)
|
||||||
#endif
|
|
||||||
CONFIG_BOOL(g_extern.netplay_is_client, "netplay_mode", "Netplay Client Enable", false, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
|
CONFIG_BOOL(g_extern.netplay_is_client, "netplay_mode", "Netplay Client Enable", false, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
|
||||||
CONFIG_BOOL(g_extern.netplay_is_spectate, "netplay_spectator_mode_enable", "Netplay Spectator Enable", false, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
|
CONFIG_BOOL(g_extern.netplay_is_spectate, "netplay_spectator_mode_enable", "Netplay Spectator Enable", false, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
|
||||||
CONFIG_UINT(g_extern.netplay_sync_frames, "netplay_delay_frames", "Netplay Delay Frames", 0, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(0, 10, 1, true, false)
|
CONFIG_UINT(g_extern.netplay_sync_frames, "netplay_delay_frames", "Netplay Delay Frames", 0, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(0, 10, 1, true, false)
|
||||||
|
@ -2615,9 +2622,6 @@ rarch_setting_t *setting_data_get_list(void)
|
||||||
|
|
||||||
START_GROUP("Path Options")
|
START_GROUP("Path Options")
|
||||||
START_SUB_GROUP("State", GROUP_NAME)
|
START_SUB_GROUP("State", GROUP_NAME)
|
||||||
#ifdef HAVE_MENU
|
|
||||||
CONFIG_BOOL(g_settings.menu_show_start_screen, "rgui_show_start_screen", "Show Start Screen", menu_show_start_screen, "OFF", "ON", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)
|
|
||||||
#endif
|
|
||||||
CONFIG_UINT(g_settings.content_history_size, "game_history_size", "Content History Size", default_content_history_size, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(0, 0, 1.0, true, false)
|
CONFIG_UINT(g_settings.content_history_size, "game_history_size", "Content History Size", default_content_history_size, GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_RANGE(0, 0, 1.0, true, false)
|
||||||
END_SUB_GROUP()
|
END_SUB_GROUP()
|
||||||
START_SUB_GROUP("Paths", GROUP_NAME)
|
START_SUB_GROUP("Paths", GROUP_NAME)
|
||||||
|
|
Loading…
Reference in New Issue