From ae6c8fa7fbe2ceb97668440b0415b85985e6debc Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 29 Sep 2014 14:19:40 +0200 Subject: [PATCH] (Settings data) Create new category 'Menu Options' --- frontend/menu/menu_common.c | 1 + frontend/menu/menu_entries.c | 1 + general.h | 1 + settings.c | 6 ++++++ settings_data.c | 14 +++++++++----- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 8f1675e5dc..ee59fd9a05 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -389,6 +389,7 @@ unsigned menu_common_type_is(const char *label, unsigned type) !strcmp(label, "Audio Options") || !strcmp(label, "disk_options") || !strcmp(label, "Path Options") || + !strcmp(label, "Menu Options") || !strcmp(label, "Privacy Options") || !strcmp(label, "Overlay Options") || !strcmp(label, "User Options") || diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c index dda61aed95..c109539611 100644 --- a/frontend/menu/menu_entries.c +++ b/frontend/menu/menu_entries.c @@ -204,6 +204,7 @@ int menu_entries_push_list(menu_handle_t *menu, !strcmp(label, "Overlay Options") || !strcmp(label, "Privacy Options") || !strcmp(label, "Video Options") || + !strcmp(label, "Menu Options") || !strcmp(label, "Audio Options") || !strcmp(label, "Path Options") || !strcmp(label, "Font Options") || diff --git a/general.h b/general.h index 757fde4d4a..961e4997f8 100644 --- a/general.h +++ b/general.h @@ -263,6 +263,7 @@ struct settings struct { char driver[32]; + bool pause_libretro; } menu; #endif diff --git a/settings.c b/settings.c index 1c34f1504a..990c13a472 100644 --- a/settings.c +++ b/settings.c @@ -379,6 +379,7 @@ void config_set_defaults(void) #ifdef HAVE_MENU g_settings.menu_show_start_screen = menu_show_start_screen; + g_settings.menu.pause_libretro = true; #endif 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.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"); if (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); #ifdef HAVE_MENU config_set_string(conf,"menu_driver", g_settings.menu.driver); + config_set_bool(conf,"menu_pause_libretro", g_settings.menu.pause_libretro); #endif config_set_bool(conf, "video_vsync", g_settings.video.vsync); config_set_bool(conf, "video_hard_sync", g_settings.video.hard_sync); diff --git a/settings_data.c b/settings_data.c index e0011186b8..21bbd8919c 100644 --- a/settings_data.c +++ b/settings_data.c @@ -2591,13 +2591,20 @@ rarch_setting_t *setting_data_get_list(void) END_GROUP() #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 START_GROUP("Netplay Options") 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) -#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) -#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_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) @@ -2615,9 +2622,6 @@ rarch_setting_t *setting_data_get_list(void) START_GROUP("Path Options") 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) END_SUB_GROUP() START_SUB_GROUP("Paths", GROUP_NAME)