libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Menu) Add more settings

Browse Source
This commit is contained in:
twinaphex 2014-07-18 02:54:30 +02:00
parent 6f32841647
commit 7c5214646f
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
frontend/menu/backend/menu_common_backend.c
View File

@ -137,7 +137,11 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
#endif #endif
case MENU_SETTINGS_GENERAL_OPTIONS: case MENU_SETTINGS_GENERAL_OPTIONS:
file_list_clear(menu->selection_buf); file_list_clear(menu->selection_buf);
file_list_push(menu->selection_buf, "Libretro Logging Level", MENU_SETTINGS_LIBRETRO_LOG_LEVEL, 0); if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "libretro_log_level")))
{
*current_setting->value.unsigned_integer = g_settings.libretro_log_level;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_LIBRETRO_LOG_LEVEL, 0);
}
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "log_verbosity"))) if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "log_verbosity")))
{ {
*current_setting->value.boolean = g_extern.verbosity; *current_setting->value.boolean = g_extern.verbosity;
@ -158,13 +162,21 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
*current_setting->value.boolean = g_extern.config_save_on_exit; *current_setting->value.boolean = g_extern.config_save_on_exit;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_CONFIG_SAVE_ON_EXIT, 0); file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_CONFIG_SAVE_ON_EXIT, 0);
} }
file_list_push(menu->selection_buf, "Configuration Per-Core", MENU_SETTINGS_PER_CORE_CONFIG, 0); if ((current_setting = setting_data_find_setting(setting_data, "core_specific_config")))
{
*current_setting->value.boolean = g_settings.core_specific_config;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_PER_CORE_CONFIG, 0);
}
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_gpu_screenshot"))) if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "video_gpu_screenshot")))
{ {
*current_setting->value.boolean = g_settings.video.gpu_screenshot; *current_setting->value.boolean = g_settings.video.gpu_screenshot;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_GPU_SCREENSHOT, 0); file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_GPU_SCREENSHOT, 0);
} }
file_list_push(menu->selection_buf, "Load Dummy On Core Shutdown", MENU_SETTINGS_LOAD_DUMMY_ON_CORE_SHUTDOWN, 0); if ((current_setting = setting_data_find_setting(setting_data, "dummy_on_core_shutdown")))
{
*current_setting->value.boolean = g_settings.load_dummy_on_core_shutdown;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_LOAD_DUMMY_ON_CORE_SHUTDOWN, 0);
}
if ((current_setting = setting_data_find_setting(setting_data, "fps_show"))) if ((current_setting = setting_data_find_setting(setting_data, "fps_show")))
{ {
*current_setting->value.boolean = g_settings.fps_show; *current_setting->value.boolean = g_settings.fps_show;
@ -641,7 +653,7 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
if (g_extern.perfcnt_enable && (current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "rewind_enable"))) if (g_extern.perfcnt_enable && (current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "rewind_enable")))
{ {
*current_setting->value.boolean = g_extern.perfcnt_enable; *current_setting->value.boolean = g_extern.perfcnt_enable;
file_list_push(menu->selection_buf, "Performance Counters", MENU_SETTINGS_PERFORMANCE_COUNTERS, 0); file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_PERFORMANCE_COUNTERS, 0);
} }
if (g_extern.main_is_init && !g_extern.libretro_dummy) if (g_extern.main_is_init && !g_extern.libretro_dummy)
@ -3696,22 +3708,16 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
menu_common_setting_set_current_unsigned_integer(current_setting, 1, action, true, false); menu_common_setting_set_current_unsigned_integer(current_setting, 1, action, true, false);
break; break;
case MENU_SETTINGS_LIBRETRO_LOG_LEVEL: case MENU_SETTINGS_LIBRETRO_LOG_LEVEL:
if (action == MENU_ACTION_LEFT) if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "libretro_log_level")))
{ menu_common_setting_set_current_unsigned_integer(current_setting, 1, action, true, true);
if (g_settings.libretro_log_level > 0)
g_settings.libretro_log_level--;
}
else if (action == MENU_ACTION_RIGHT)
if (g_settings.libretro_log_level < 3)
g_settings.libretro_log_level++;
break; break;
case MENU_SETTINGS_LOGGING_VERBOSITY: case MENU_SETTINGS_LOGGING_VERBOSITY:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "log_verbosity"))) if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "log_verbosity")))
menu_common_setting_set_current_boolean(current_setting, action); menu_common_setting_set_current_boolean(current_setting, action);
break; break;
case MENU_SETTINGS_PERFORMANCE_COUNTERS_ENABLE: case MENU_SETTINGS_PERFORMANCE_COUNTERS_ENABLE:
if (action == MENU_ACTION_LEFT || action == MENU_ACTION_RIGHT) if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "perfcnt_enable")))
g_extern.perfcnt_enable = !g_extern.perfcnt_enable; menu_common_setting_set_current_boolean(current_setting, action);
break; break;
case MENU_SETTINGS_CONFIG_SAVE_ON_EXIT: case MENU_SETTINGS_CONFIG_SAVE_ON_EXIT:
if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "config_save_on_exit"))) if ((current_setting = (rarch_setting_t*)setting_data_find_setting(setting_data, "config_save_on_exit")))
@ -3730,11 +3736,8 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
menu_common_setting_set_current_boolean(current_setting, action); menu_common_setting_set_current_boolean(current_setting, action);
break; break;
case MENU_SETTINGS_PER_CORE_CONFIG: case MENU_SETTINGS_PER_CORE_CONFIG:
if (action == MENU_ACTION_OK || action == MENU_ACTION_RIGHT if ((current_setting = setting_data_find_setting(setting_data, "core_specific_config")))
|| action == MENU_ACTION_LEFT) menu_common_setting_set_current_boolean(current_setting, action);
g_settings.core_specific_config = !g_settings.core_specific_config;
else if (action == MENU_ACTION_START)
g_settings.core_specific_config = default_core_specific_config;
break; break;
#if defined(HAVE_THREADS) #if defined(HAVE_THREADS)
case MENU_SETTINGS_SRAM_AUTOSAVE: case MENU_SETTINGS_SRAM_AUTOSAVE:
@ -4968,10 +4971,8 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
} }
break; break;
case MENU_SETTINGS_LOAD_DUMMY_ON_CORE_SHUTDOWN: case MENU_SETTINGS_LOAD_DUMMY_ON_CORE_SHUTDOWN:
if (action == MENU_ACTION_OK || action == MENU_ACTION_LEFT || action == MENU_ACTION_RIGHT) if ((current_setting = setting_data_find_setting(setting_data, "dummy_on_core_shutdown")))
g_settings.load_dummy_on_core_shutdown = !g_settings.load_dummy_on_core_shutdown; menu_common_setting_set_current_boolean(current_setting, action);
else if (action == MENU_ACTION_START)
g_settings.load_dummy_on_core_shutdown = load_dummy_on_core_shutdown;
break; break;
default: default:
break; break;

9
settings_data.c
View File

@ -747,6 +747,12 @@ static void general_change_handler(const void *data)
g_extern.verbosity = *setting->value.boolean; g_extern.verbosity = *setting->value.boolean;
else if (!strcmp(setting->name, "perfcnt_enable")) else if (!strcmp(setting->name, "perfcnt_enable"))
g_extern.perfcnt_enable = *setting->value.boolean; g_extern.perfcnt_enable = *setting->value.boolean;
else if (!strcmp(setting->name, "core_specific_config"))
g_settings.core_specific_config = *setting->value.boolean;
else if (!strcmp(setting->name, "dummy_on_core_shutdown"))
g_settings.load_dummy_on_core_shutdown = *setting->value.boolean;
else if (!strcmp(setting->name, "libretro_log_level"))
g_settings.libretro_log_level = *setting->value.unsigned_integer;
} }
@ -836,8 +842,11 @@ rarch_setting_t* setting_data_get_list(void)
START_GROUP("General Options") START_GROUP("General Options")
START_SUB_GROUP("General Options") START_SUB_GROUP("General Options")
CONFIG_BOOL(g_extern.verbosity, "log_verbosity", "Logging Verbosity", false, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_BOOL(g_extern.verbosity, "log_verbosity", "Logging Verbosity", false, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_UINT(g_settings.libretro_log_level, "libretro_log_level", "Libretro Logging Level", libretro_log_level, GROUP_NAME, SUBGROUP_NAME, general_change_handler) WITH_RANGE(0, 3)
CONFIG_BOOL(g_extern.perfcnt_enable, "perfcnt_enable", "Performance Counters", false, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_BOOL(g_extern.perfcnt_enable, "perfcnt_enable", "Performance Counters", false, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_BOOL(g_extern.config_save_on_exit, "config_save_on_exit", "Configuration Save On Exit", config_save_on_exit, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_BOOL(g_extern.config_save_on_exit, "config_save_on_exit", "Configuration Save On Exit", config_save_on_exit, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_BOOL(g_settings.core_specific_config, "core_specific_config", "Configuration Per-Core", default_core_specific_config, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_BOOL(g_settings.load_dummy_on_core_shutdown, "dummy_on_core_shutdown", "Dummy On Core Shutdown", load_dummy_on_core_shutdown, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_BOOL(g_settings.fps_show, "fps_show", "Show Framerate", fps_show, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_BOOL(g_settings.fps_show, "fps_show", "Show Framerate", fps_show, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_BOOL(g_settings.rewind_enable, "rewind_enable", "Rewind", rewind_enable, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_BOOL(g_settings.rewind_enable, "rewind_enable", "Rewind", rewind_enable, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
//CONFIG_SIZE(g_settings.rewind_buffer_size, "rewind_buffer_size", "Rewind Buffer Size", rewind_buffer_size, GROUP_NAME, SUBGROUP_NAME, general_change_handler) //CONFIG_SIZE(g_settings.rewind_buffer_size, "rewind_buffer_size", "Rewind Buffer Size", rewind_buffer_size, GROUP_NAME, SUBGROUP_NAME, general_change_handler)