mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Reimplement START_GROUP/START_SUB_GROUP macros"

Browse Source 
This reverts commit 5e5dcd9c8ba694a4e6dc9adeb7b81e2c2e58b26d.
This commit is contained in:
twinaphex 2014-10-06 22:13:19 +02:00
parent 5e5dcd9c8b
commit 8fe70d26de
1 changed files with 435 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
settings_data.c
View File

@ -2182,27 +2182,19 @@ static void data_list_current_add_cmd(
(*list)[list_info->index -1].cmd_trigger.idx = values; (*list)[list_info->index -1].cmd_trigger.idx = values;
} }
#define START_GROUP(group_info, NAME) if (!(data_list_append(&list, list_info, setting_data_group_setting (ST_GROUP, NAME)))) goto error #define START_GROUP(group_info, NAME) strlcpy(group_info.name, NAME, sizeof(group_info.name)); if (!(data_list_append(&list, list_info, setting_data_group_setting (ST_GROUP, NAME)))) goto error
#define END_GROUP(list, list_info) if (!(data_list_append(&list, list_info, setting_data_group_setting (ST_END_GROUP, 0)))) goto error #define END_GROUP(list, list_info) if (!(data_list_append(&list, list_info, setting_data_group_setting (ST_END_GROUP, 0)))) goto error
#define START_SUB_GROUP(list, list_info, NAME, group_info, subgroup_info) if (!(data_list_append(&list, list_info, setting_data_subgroup_setting (ST_SUB_GROUP, NAME, group_info)))) goto error #define START_SUB_GROUP(list, list_info, NAME, group_info, subgroup_info) strlcpy(subgroup_info.name, NAME, sizeof(subgroup_info.name)); if (!(data_list_append(&list, list_info, setting_data_subgroup_setting (ST_SUB_GROUP, NAME, group_info)))) goto error
#define END_SUB_GROUP(list, list_info) if (!(data_list_append(&list, list_info, setting_data_group_setting (ST_END_SUB_GROUP, 0)))) goto error #define END_SUB_GROUP(list, list_info) if (!(data_list_append(&list, list_info, setting_data_group_setting (ST_END_SUB_GROUP, 0)))) goto error
#define CONFIG_BOOL(TARGET, NAME, SHORT, DEF, OFF, ON, group_info, \ #define CONFIG_BOOL(TARGET, NAME, SHORT, DEF, OFF, ON, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) if (!data_list_append(&list, list_info, setting_data_bool_setting (NAME, SHORT, &TARGET, DEF, OFF, ON, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER))) goto error
subgroup_info, CHANGE_HANDLER, READ_HANDLER) if (!data_list_append(&list, list_info, setting_data_bool_setting(NAME, SHORT, &TARGET, DEF, OFF, ON, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER))) goto error #define CONFIG_INT(TARGET, NAME, SHORT, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) if (!(data_list_append(&list, list_info, setting_data_int_setting (NAME, SHORT, &TARGET, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error
#define CONFIG_INT(TARGET, NAME, SHORT, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) \ #define CONFIG_UINT(TARGET, NAME, SHORT, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) if (!(data_list_append(&list, list_info, setting_data_uint_setting (NAME, SHORT, &TARGET, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error
if (!(data_list_append(&list, list_info, setting_data_int_setting(NAME, SHORT, &TARGET, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error #define CONFIG_FLOAT(TARGET, NAME, SHORT, DEF, ROUNDING, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) if (!(data_list_append(&list, list_info, setting_data_float_setting (NAME, SHORT, &TARGET, DEF, ROUNDING, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error
#define CONFIG_UINT(TARGET, NAME, SHORT, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) \ #define CONFIG_PATH(TARGET, NAME, SHORT, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) if (!(data_list_append(&list, list_info, setting_data_string_setting(ST_PATH, NAME, SHORT, TARGET, sizeof(TARGET), DEF, "", group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error
if (!(data_list_append(&list, list_info, setting_data_uint_setting(NAME, SHORT, &TARGET, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error #define CONFIG_DIR(TARGET, NAME, SHORT, DEF, EMPTY, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) if (!(data_list_append(&list, list_info, setting_data_string_setting(ST_DIR, NAME, SHORT, TARGET, sizeof(TARGET), DEF, EMPTY, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error
#define CONFIG_FLOAT(TARGET, NAME, SHORT, DEF, ROUNDING, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) \ #define CONFIG_STRING(TARGET, NAME, SHORT, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) if (!(data_list_append(&list, list_info, setting_data_string_setting(ST_STRING, NAME, SHORT, TARGET, sizeof(TARGET), DEF, "", group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error
if (!(data_list_append(&list, list_info, setting_data_float_setting (NAME, SHORT, &TARGET, DEF, ROUNDING, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error
#define CONFIG_PATH(TARGET, NAME, SHORT, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) \
if (!(data_list_append(&list, list_info, setting_data_string_setting(ST_PATH, NAME, SHORT, TARGET, sizeof(TARGET), DEF, "", group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error
#define CONFIG_DIR(TARGET, NAME, SHORT, DEF, EMPTY, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) \
if (!(data_list_append(&list, list_info, setting_data_string_setting(ST_DIR, NAME, SHORT, TARGET, sizeof(TARGET), DEF, EMPTY, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error
#define CONFIG_STRING(TARGET, NAME, SHORT, DEF, group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER) \
if (!(data_list_append(&list, list_info, setting_data_string_setting(ST_STRING, NAME, SHORT, TARGET, sizeof(TARGET), DEF, "", group_info, subgroup_info, CHANGE_HANDLER, READ_HANDLER)))) goto error
#define CONFIG_HEX(TARGET, NAME, SHORT, group_info, subgroup_info) #define CONFIG_HEX(TARGET, NAME, SHORT, group_info, subgroup_info)
#define CONFIG_BIND(TARGET, PLAYER, NAME, SHORT, DEF, group_info, subgroup_info) \ #define CONFIG_BIND(TARGET, PLAYER, NAME, SHORT, DEF, group_info, subgroup_info) if (!(data_list_append(&list, list_info, setting_data_bind_setting (NAME, SHORT, &TARGET, PLAYER, DEF, group_info, subgroup_info)))) goto error
if (!(data_list_append(&list, list_info, setting_data_bind_setting (NAME, SHORT, &TARGET, PLAYER, DEF, group_info, subgroup_info)))) goto error
#ifdef GEKKO #ifdef GEKKO
@ -2246,10 +2238,8 @@ rarch_setting_t *setting_data_get_mainmenu(bool regenerate)
if (!list) if (!list)
goto error; goto error;
strlcpy(group_info.name, "Main Menu", sizeof(group_info.name)); START_GROUP(group_info, "Main Menu");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
#if defined(HAVE_DYNAMIC) || defined(HAVE_LIBRETRO_MANAGEMENT) #if defined(HAVE_DYNAMIC) || defined(HAVE_LIBRETRO_MANAGEMENT)
CONFIG_BOOL(lists[0], "core_list", "Core", false, "", "", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(lists[0], "core_list", "Core", false, "", "", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_flags(&list, list_info, SD_FLAG_PUSH_ACTION); data_list_current_add_flags(&list, list_info, SD_FLAG_PUSH_ACTION);
@ -2378,10 +2368,8 @@ rarch_setting_t *setting_data_get_list(void)
if (!list) if (!list)
goto error; goto error;
strlcpy(group_info.name, "Driver Options", sizeof(group_info.name)); START_GROUP(group_info, "Driver Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_STRING(g_settings.input.driver, "input_driver", "Input Driver", config_get_default_input(), group_info.name, subgroup_info.name, NULL, NULL); CONFIG_STRING(g_settings.input.driver, "input_driver", "Input Driver", config_get_default_input(), group_info.name, subgroup_info.name, NULL, NULL);
data_list_current_add_flags(&list, list_info, SD_FLAG_IS_DRIVER); data_list_current_add_flags(&list, list_info, SD_FLAG_IS_DRIVER);
CONFIG_STRING(g_settings.video.driver, "video_driver", "Video Driver", config_get_default_video(), group_info.name, subgroup_info.name, NULL, NULL); CONFIG_STRING(g_settings.video.driver, "video_driver", "Video Driver", config_get_default_video(), group_info.name, subgroup_info.name, NULL, NULL);
@ -2409,10 +2397,8 @@ rarch_setting_t *setting_data_get_list(void)
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info); END_GROUP(list, list_info);
strlcpy(group_info.name, "General Options", sizeof(group_info.name)); START_GROUP(group_info, "General Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_extern.verbosity, "log_verbosity", "Logging Verbosity", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_extern.verbosity, "log_verbosity", "Logging Verbosity", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_UINT(g_settings.libretro_log_level, "libretro_log_level", "Libretro Logging Level", libretro_log_level, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_UINT(g_settings.libretro_log_level, "libretro_log_level", "Libretro Logging Level", libretro_log_level, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_range(&list, list_info, 0, 3, 1.0, true, true); data_list_current_add_range(&list, list_info, 0, 3, 1.0, true, true);
@ -2451,9 +2437,7 @@ rarch_setting_t *setting_data_get_list(void)
CONFIG_BOOL(g_settings.savestate_auto_load, "savestate_auto_load", "Auto Load State", savestate_auto_load, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.savestate_auto_load, "savestate_auto_load", "Auto Load State", savestate_auto_load, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_INT(g_settings.state_slot, "state_slot", "State Slot", 0, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_INT(g_settings.state_slot, "state_slot", "State Slot", 0, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
START_SUB_GROUP(list, list_info, "Miscellaneous", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "Miscellaneous", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
#if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY) #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
CONFIG_BOOL(g_settings.network_cmd_enable, "network_cmd_enable", "Network Commands", network_cmd_enable, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.network_cmd_enable, "network_cmd_enable", "Network Commands", network_cmd_enable, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
#if 0 #if 0
@ -2464,14 +2448,11 @@ rarch_setting_t *setting_data_get_list(void)
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info); END_GROUP(list, list_info);
strlcpy(group_info.name, "Video Options", sizeof(group_info.name)); START_GROUP(group_info, "Video Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.video.shared_context, "video_shared_context", "HW Shared Context Enable", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.video.shared_context, "video_shared_context", "HW Shared Context Enable", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Monitor", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Monitor", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_UINT(g_settings.video.monitor_index, "video_monitor_index", "Monitor Index", monitor_index, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_UINT(g_settings.video.monitor_index, "video_monitor_index", "Monitor Index", monitor_index, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_cmd(&list, list_info, RARCH_CMD_REINIT); data_list_current_add_cmd(&list, list_info, RARCH_CMD_REINIT);
data_list_current_add_range(&list, list_info, 0, 1, 1, true, false); data_list_current_add_range(&list, list_info, 0, 1, 1, true, false);
@ -2491,8 +2472,7 @@ rarch_setting_t *setting_data_get_list(void)
data_list_current_add_flags(&list, list_info, SD_FLAG_CMD_APPLY_AUTO); data_list_current_add_flags(&list, list_info, SD_FLAG_CMD_APPLY_AUTO);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Aspect", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Aspect", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.video.force_aspect, "video_force_aspect", "Force aspect ratio", force_aspect, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.video.force_aspect, "video_force_aspect", "Force aspect ratio", force_aspect, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_FLOAT(g_settings.video.aspect_ratio, "video_aspect_ratio", "Aspect Ratio", aspect_ratio, "%.2f", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_FLOAT(g_settings.video.aspect_ratio, "video_aspect_ratio", "Aspect Ratio", aspect_ratio, "%.2f", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_BOOL(g_settings.video.aspect_ratio_auto, "video_aspect_ratio_auto", "Use Auto Aspect Ratio", aspect_ratio_auto, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.video.aspect_ratio_auto, "video_aspect_ratio_auto", "Use Auto Aspect Ratio", aspect_ratio_auto, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
@ -2502,8 +2482,7 @@ rarch_setting_t *setting_data_get_list(void)
data_list_current_add_flags(&list, list_info, SD_FLAG_CMD_APPLY_AUTO); data_list_current_add_flags(&list, list_info, SD_FLAG_CMD_APPLY_AUTO);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Scaling", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Scaling", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
#if !defined(RARCH_CONSOLE) && !defined(RARCH_MOBILE) #if !defined(RARCH_CONSOLE) && !defined(RARCH_MOBILE)
CONFIG_FLOAT(g_settings.video.scale, "video_scale", "Windowed Scale", scale, "%.1fx", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_FLOAT(g_settings.video.scale, "video_scale", "Windowed Scale", scale, "%.1fx", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_range(&list, list_info, 1.0, 10.0, 1.0, true, true); data_list_current_add_range(&list, list_info, 1.0, 10.0, 1.0, true, true);
@ -2532,8 +2511,7 @@ rarch_setting_t *setting_data_get_list(void)
#endif #endif
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Synchronization", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Synchronization", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
#if defined(HAVE_THREADS) && !defined(RARCH_CONSOLE) #if defined(HAVE_THREADS) && !defined(RARCH_CONSOLE)
CONFIG_BOOL(g_settings.video.threaded, "video_threaded", "Threaded Video", video_threaded, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.video.threaded, "video_threaded", "Threaded Video", video_threaded, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_cmd(&list, list_info, RARCH_CMD_REINIT); data_list_current_add_cmd(&list, list_info, RARCH_CMD_REINIT);
@ -2554,8 +2532,7 @@ rarch_setting_t *setting_data_get_list(void)
#endif #endif
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Miscellaneous", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Miscellaneous", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.video.post_filter_record, "video_post_filter_record", "Post filter record Enable", post_filter_record, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.video.post_filter_record, "video_post_filter_record", "Post filter record Enable", post_filter_record, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_BOOL(g_settings.video.gpu_record, "video_gpu_record", "GPU Record Enable", gpu_record, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.video.gpu_record, "video_gpu_record", "GPU Record Enable", gpu_record, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_BOOL(g_settings.video.gpu_screenshot, "video_gpu_screenshot", "GPU Screenshot Enable", gpu_screenshot, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.video.gpu_screenshot, "video_gpu_screenshot", "GPU Screenshot Enable", gpu_screenshot, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
@ -2578,20 +2555,16 @@ rarch_setting_t *setting_data_get_list(void)
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info); END_GROUP(list, list_info);
strlcpy(group_info.name, "Shader Options", sizeof(group_info.name)); START_GROUP(group_info, "Shader Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.video.shader_enable, "video_shader_enable", "Enable Shaders", shader_enable, "OFF", "ON", group_info.name, subgroup_info.name, NULL, NULL); CONFIG_BOOL(g_settings.video.shader_enable, "video_shader_enable", "Enable Shaders", shader_enable, "OFF", "ON", group_info.name, subgroup_info.name, NULL, NULL);
CONFIG_PATH(g_settings.video.shader_path, "video_shader", "Shader", "", group_info.name, subgroup_info.name, NULL, NULL); CONFIG_PATH(g_settings.video.shader_path, "video_shader", "Shader", "", group_info.name, subgroup_info.name, NULL, NULL);
data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_EMPTY); data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_EMPTY);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info); END_GROUP(list, list_info);
strlcpy(group_info.name, "Font Options", sizeof(group_info.name)); START_GROUP(group_info, "Font Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "Messages", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "Messages", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_PATH(g_settings.video.font_path, "video_font_path", "Font Path", "", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_PATH(g_settings.video.font_path, "video_font_path", "Font Path", "", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_EMPTY); data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_EMPTY);
CONFIG_FLOAT(g_settings.video.font_size, "video_font_size", "OSD Font Size", font_size, "%.1f", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_FLOAT(g_settings.video.font_size, "video_font_size", "OSD Font Size", font_size, "%.1f", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
@ -2604,10 +2577,8 @@ rarch_setting_t *setting_data_get_list(void)
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info); END_GROUP(list, list_info);
strlcpy(group_info.name, "Audio Options", sizeof(group_info.name)); START_GROUP(group_info, "Audio Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.audio.enable, "audio_enable", "Audio Enable", audio_enable, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.audio.enable, "audio_enable", "Audio Enable", audio_enable, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_BOOL(g_extern.audio_data.mute, "audio_mute_enable", "Audio Mute", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_extern.audio_data.mute, "audio_mute_enable", "Audio Mute", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_FLOAT(g_settings.audio.volume, "audio_volume", "Volume Level", audio_volume, "%.1f", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_FLOAT(g_settings.audio.volume, "audio_volume", "Volume Level", audio_volume, "%.1f", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
@ -2617,8 +2588,7 @@ rarch_setting_t *setting_data_get_list(void)
#endif #endif
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Synchronization", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Synchronization", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.audio.sync, "audio_sync", "Audio Sync Enable", audio_sync, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.audio.sync, "audio_sync", "Audio Sync Enable", audio_sync, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_UINT(g_settings.audio.latency, "audio_latency", "Audio Latency", g_defaults.settings.out_latency ? g_defaults.settings.out_latency : out_latency, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_UINT(g_settings.audio.latency, "audio_latency", "Audio Latency", g_defaults.settings.out_latency ? g_defaults.settings.out_latency : out_latency, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_FLOAT(g_settings.audio.rate_control_delta, "audio_rate_control_delta", "Audio Rate Control Delta", rate_control_delta, "%.3f", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_FLOAT(g_settings.audio.rate_control_delta, "audio_rate_control_delta", "Audio Rate Control Delta", rate_control_delta, "%.3f", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
@ -2626,8 +2596,7 @@ rarch_setting_t *setting_data_get_list(void)
CONFIG_UINT(g_settings.audio.block_frames, "audio_block_frames", "Block Frames", 0, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_UINT(g_settings.audio.block_frames, "audio_block_frames", "Block Frames", 0, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Miscellaneous", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Miscellaneous", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_STRING(g_settings.audio.device, "audio_device", "Device", "", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_STRING(g_settings.audio.device, "audio_device", "Device", "", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_INPUT); data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_INPUT);
CONFIG_UINT(g_settings.audio.out_rate, "audio_out_rate", "Audio Output Rate", out_rate, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_UINT(g_settings.audio.out_rate, "audio_out_rate", "Audio Output Rate", out_rate, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
@ -2638,15 +2607,12 @@ rarch_setting_t *setting_data_get_list(void)
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info); END_GROUP(list, list_info);
strlcpy(group_info.name, "Input Options", sizeof(group_info.name)); START_GROUP(group_info, "Input Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.input.autodetect_enable, "input_autodetect_enable", "Autodetect Enable", input_autodetect_enable, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.input.autodetect_enable, "input_autodetect_enable", "Autodetect Enable", input_autodetect_enable, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Joypad Mapping", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Joypad Mapping", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
/* TODO: input_libretro_device_p%u */ /* TODO: input_libretro_device_p%u */
CONFIG_INT(g_settings.input.joypad_map[0], "input_player1_joypad_index", "Player 1 Pad Index", 0, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_INT(g_settings.input.joypad_map[0], "input_player1_joypad_index", "Player 1 Pad Index", 0, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_INT(g_settings.input.joypad_map[1], "input_player2_joypad_index", "Player 2 Pad Index", 1, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_INT(g_settings.input.joypad_map[1], "input_player2_joypad_index", "Player 2 Pad Index", 1, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
@ -2655,8 +2621,7 @@ rarch_setting_t *setting_data_get_list(void)
CONFIG_INT(g_settings.input.joypad_map[4], "input_player5_joypad_index", "Player 5 Pad Index", 4, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_INT(g_settings.input.joypad_map[4], "input_player5_joypad_index", "Player 5 Pad Index", 4, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Turbo/Deadzone", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Turbo/Deadzone", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_FLOAT(g_settings.input.axis_threshold, "input_axis_threshold", "Input Axis Threshold", axis_threshold, "%.3f", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_FLOAT(g_settings.input.axis_threshold, "input_axis_threshold", "Input Axis Threshold", axis_threshold, "%.3f", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_range(&list, list_info, 0, 1.00, 0.001, true, true); data_list_current_add_range(&list, list_info, 0, 1.00, 0.001, true, true);
CONFIG_UINT(g_settings.input.turbo_period, "input_turbo_period", "Turbo Period", turbo_period, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_UINT(g_settings.input.turbo_period, "input_turbo_period", "Turbo Period", turbo_period, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
@ -2667,8 +2632,7 @@ rarch_setting_t *setting_data_get_list(void)
/* The second argument to config bind is 1 /* The second argument to config bind is 1
* based for players and 0 only for meta keys. */ * based for players and 0 only for meta keys. */
strlcpy(subgroup_info.name, "Meta Keys", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Meta Keys", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
for (i = 0; i != RARCH_BIND_LIST_END; i ++) for (i = 0; i != RARCH_BIND_LIST_END; i ++)
{ {
@ -2705,23 +2669,18 @@ rarch_setting_t *setting_data_get_list(void)
} }
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
} }
strlcpy(subgroup_info.name, "Onscreen Keyboard", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Onscreen Keyboard", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.osk.enable, "osk_enable", "Onscreen Keyboard Enable", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.osk.enable, "osk_enable", "Onscreen Keyboard Enable", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Miscellaneous", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Miscellaneous", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.input.netplay_client_swap_input, "netplay_client_swap_input", "Swap Netplay Input", netplay_client_swap_input, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.input.netplay_client_swap_input, "netplay_client_swap_input", "Swap Netplay Input", netplay_client_swap_input, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info); END_GROUP(list, list_info);
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
strlcpy(group_info.name, "Overlay Options", sizeof(group_info.name)); START_GROUP(group_info, "Overlay Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_PATH(g_settings.input.overlay, "input_overlay", "Overlay Preset", g_extern.overlay_dir, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_PATH(g_settings.input.overlay, "input_overlay", "Overlay Preset", g_extern.overlay_dir, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_values(&list, list_info, "cfg"); data_list_current_add_values(&list, list_info, "cfg");
data_list_current_add_cmd(&list, list_info, RARCH_CMD_OVERLAY_INIT); data_list_current_add_cmd(&list, list_info, RARCH_CMD_OVERLAY_INIT);
@ -2739,10 +2698,8 @@ rarch_setting_t *setting_data_get_list(void)
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
strlcpy(group_info.name, "Menu Options", sizeof(group_info.name)); START_GROUP(group_info, "Menu Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.menu_show_start_screen, "rgui_show_start_screen", "Show Start Screen", menu_show_start_screen, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.menu_show_start_screen, "rgui_show_start_screen", "Show Start Screen", menu_show_start_screen, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_BOOL(g_settings.menu.pause_libretro, "menu_pause_libretro", "Pause Libretro", true, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.menu.pause_libretro, "menu_pause_libretro", "Pause Libretro", true, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_cmd(&list, list_info, RARCH_CMD_MENU_PAUSE_LIBRETRO); data_list_current_add_cmd(&list, list_info, RARCH_CMD_MENU_PAUSE_LIBRETRO);
@ -2752,10 +2709,8 @@ rarch_setting_t *setting_data_get_list(void)
#endif #endif
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
strlcpy(group_info.name, "Netplay Options", sizeof(group_info.name)); START_GROUP(group_info, "Netplay Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_extern.netplay_enable, "netplay_enable", "Netplay Enable", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_extern.netplay_enable, "netplay_enable", "Netplay Enable", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_STRING(g_extern.netplay_server, "netplay_ip_address", "IP Address", "", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_STRING(g_extern.netplay_server, "netplay_ip_address", "IP Address", "", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_INPUT); data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_INPUT);
@ -2770,10 +2725,8 @@ rarch_setting_t *setting_data_get_list(void)
END_GROUP(list, list_info); END_GROUP(list, list_info);
#endif #endif
strlcpy(group_info.name, "User Options", sizeof(group_info.name)); START_GROUP(group_info, "User Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_STRING(g_settings.username, "netplay_nickname", "Username", "", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_STRING(g_settings.username, "netplay_nickname", "Username", "", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_INPUT); data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_INPUT);
CONFIG_UINT(g_settings.user_language, "user_language", "Language", def_user_language, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_UINT(g_settings.user_language, "user_language", "Language", def_user_language, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
@ -2782,15 +2735,12 @@ rarch_setting_t *setting_data_get_list(void)
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info); END_GROUP(list, list_info);
strlcpy(group_info.name, "Path Options", sizeof(group_info.name)); START_GROUP(group_info, "Path Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_UINT(g_settings.content_history_size, "game_history_size", "Content History Size", default_content_history_size, group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_UINT(g_settings.content_history_size, "game_history_size", "Content History Size", default_content_history_size, group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_range(&list, list_info, 0, 0, 1.0, true, false); data_list_current_add_range(&list, list_info, 0, 0, 1.0, true, false);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
strlcpy(subgroup_info.name, "Paths", sizeof(subgroup_info.name)); START_SUB_GROUP(list, list_info, "Paths", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
#ifdef HAVE_MENU #ifdef HAVE_MENU
CONFIG_DIR(g_settings.menu_content_directory, "rgui_browser_directory", "Browser Directory", "", "<default>", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_DIR(g_settings.menu_content_directory, "rgui_browser_directory", "Browser Directory", "", "<default>", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR); data_list_current_add_flags(&list, list_info, SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR);
@ -2847,10 +2797,8 @@ rarch_setting_t *setting_data_get_list(void)
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info); END_GROUP(list, list_info);
strlcpy(group_info.name, "Privacy Options", sizeof(group_info.name)); START_GROUP(group_info, "Privacy Options");
START_GROUP(group_info, group_info.name); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
strlcpy(subgroup_info.name, "State", sizeof(subgroup_info.name));
START_SUB_GROUP(list, list_info, subgroup_info.name, group_info.name, subgroup_info);
CONFIG_BOOL(g_settings.camera.allow, "camera_allow", "Allow Camera", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.camera.allow, "camera_allow", "Allow Camera", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
CONFIG_BOOL(g_settings.location.allow, "location_allow", "Allow Location", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler); CONFIG_BOOL(g_settings.location.allow, "location_allow", "Allow Location", false, "OFF", "ON", group_info.name, subgroup_info.name, general_write_handler, general_read_handler);
END_SUB_GROUP(list, list_info); END_SUB_GROUP(list, list_info);