diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 4daa31c85a..2995400212 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -122,79 +122,79 @@ #define _21_SECONDS 21000000 #define CONFIG_SIZE(a, b, c, d, e, f, g, h, i, j, k, l) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_size(a, b, c, d, e, f, g, h, i, j, k, l) #define CONFIG_BOOL_ALT(a, b, c, d, e, f, g, h, i, j, k, l, m, n) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_bool_alt(a, b, c, d, e, f, g, h, i, j, k, l, m, n) #define CONFIG_BOOL(a, b, c, d, e, f, g, h, i, j, k, l, m, n) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_bool(a, b, c, d, e, f, g, h, i, j, k, l, m, n) #define CONFIG_INT(a, b, c, d, e, f, g, h, i, j, k) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_int(a, b, c, d, e, f, g, h, i, j, k) #define CONFIG_UINT_ALT(a, b, c, d, e, f, g, h, i, j, k) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_uint_alt(a, b, c, d, e, f, g, h, i, j, k) #define CONFIG_UINT(a, b, c, d, e, f, g, h, i, j, k) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_uint(a, b, c, d, e, f, g, h, i, j, k) #define CONFIG_STRING(a, b, c, d, e, f, g, h, i, j, k, l) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_string(a, b, c, d, e, f, g, h, i, j, k, l) #define CONFIG_FLOAT(a, b, c, d, e, f, g, h, i, j, k, l) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_float(a, b, c, d, e, f, g, h, i, j, k, l) #define CONFIG_DIR(a, b, c, d, e, f, g, h, i, j, k, l, m) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_dir(a, b, c, d, e, f, g, h, i, j, k, l, m) #define CONFIG_PATH(a, b, c, d, e, f, g, h, i, j, k, l) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_path(a, b, c, d, e, f, g, h, i, j, k, l) #define CONFIG_ACTION_ALT(a, b, c, d, e, f, g) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_action_alt(a, b, c, d, e, f, g) #define CONFIG_ACTION(a, b, c, d, e, f, g) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_action(a, b, c, d, e, f, g) #define END_GROUP(a, b, c) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ end_group(a, b, c) #define START_SUB_GROUP(a, b, c, d, e, f) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ start_sub_group(a, b, c, d, e, f) #define END_SUB_GROUP(a, b, c) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ end_sub_group(a, b, c) #define CONFIG_STRING_OPTIONS(a, b, c, d, e, f, g, h, i, j, k, l, m) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_string_options(a, b, c, d, e, f, g, h, i, j, k, l, m) #define CONFIG_HEX(a, b, c, d, e, f, g, h, i, j, k, l) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_hex(a, b, c, d, e, f, g, h, i, j, k, l) #define CONFIG_BIND_ALT(a, b, c, d, e, f, g, h, i, j, k) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_bind_alt(a, b, c, d, e, f, g, h, i, j, k) #define CONFIG_BIND(a, b, c, d, e, f, g, h, i, j, k, l) \ - if (settings_list_append(a, b)) \ + if (SETTINGS_LIST_APPEND(a, b)) \ config_bind(a, b, c, d, e, f, g, h, i, j, k, l) #define SETTINGS_DATA_LIST_CURRENT_ADD_FREE_FLAGS(a, b, c) \ @@ -212,16 +212,15 @@ setting_add_special_callbacks(a, b, c); \ } -#define settings_list_append(a, b) ((a && *a && b) ? ((((b)->index == (b)->size)) ? settings_list_append_internal(a, b) : true) : false) +#define SETTINGS_LIST_APPEND(a, b) ((a && *a && b) ? ((((b)->index == (b)->size)) ? SETTINGS_LIST_APPEND_internal(a, b) : true) : false) -#define menu_settings_list_current_idx(list_info) (list_info->index - 1) +#define MENU_SETTINGS_LIST_CURRENT_IDX(list_info) (list_info->index - 1) -#define menu_settings_list_current_add_values(list, list_info, str) ((*(list))[menu_settings_list_current_idx((list_info))].values = (str)) +#define MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, str) ((*(list))[MENU_SETTINGS_LIST_CURRENT_IDX((list_info))].values = (str)) -#define menu_settings_list_current_add_cmd(list, list_info, str) (*(list))[menu_settings_list_current_idx(list_info)].cmd_trigger.idx = (str) +#define MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, str) (*(list))[MENU_SETTINGS_LIST_CURRENT_IDX(list_info)].cmd_trigger.idx = (str) - -#define config_uint_cbs(var, label, left, right, msg_enum_base, string_rep, min, max, step) \ +#define CONFIG_UINT_CBS(var, label, left, right, msg_enum_base, string_rep, min, max, step) \ CONFIG_UINT( \ list, list_info, \ &(var), \ @@ -468,7 +467,7 @@ static void setting_add_special_callbacks( } } -static bool settings_list_append_internal( +static bool SETTINGS_LIST_APPEND_internal( rarch_setting_t **list, rarch_setting_info_t *list_info) { @@ -2546,7 +2545,7 @@ static void START_GROUP(rarch_setting_t **list, rarch_setting_info_t *list_info, const char *name, const char *parent_group) { group_info->name = name; - if (!settings_list_append(list, list_info)) + if (!SETTINGS_LIST_APPEND(list, list_info)) return; (*list)[list_info->index++] = setting_group_setting (ST_GROUP, name, parent_group); } @@ -2566,7 +2565,7 @@ static bool start_sub_group(rarch_setting_t **list, { subgroup_info->name = name; - if (!settings_list_append(list, list_info)) + if (!SETTINGS_LIST_APPEND(list, list_info)) return false; (*list)[list_info->index++] = setting_subgroup_setting (ST_SUB_GROUP, name, group_info->name, parent_group, false); @@ -7772,7 +7771,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].size = (uint32_t)path_get_realsize(RARCH_PATH_CORE); (*list)[list_info->index - 1].value.target.string = path_get_ptr(RARCH_PATH_CORE); (*list)[list_info->index - 1].values = ext_name; - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_LOAD_CORE); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_LOAD_CORE); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_BROWSER_ACTION); } } @@ -7891,7 +7890,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_RESTART_RETROARCH); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_RESTART_RETROARCH); } #endif @@ -7920,7 +7919,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); CONFIG_ACTION( @@ -7930,7 +7929,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); CONFIG_ACTION( @@ -7940,7 +7939,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_SAVE_CONFIG); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_MENU_SAVE_CONFIG); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); CONFIG_ACTION( @@ -7950,7 +7949,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CORE); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CORE); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); CONFIG_ACTION( @@ -7960,7 +7959,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); CONFIG_ACTION( @@ -7970,7 +7969,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_GAME); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG_OVERRIDE_GAME); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); CONFIG_ACTION( @@ -7989,7 +7988,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_UI_COMPANION_TOGGLE); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_UI_COMPANION_TOGGLE); #endif #if !defined(IOS) /* Apple rejects iOS apps that let you forcibly quit them. */ @@ -8010,7 +8009,7 @@ static bool setting_append_list( &subgroup_info, parent_group); #endif - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_QUIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_QUIT); #endif #if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) @@ -8058,7 +8057,7 @@ static bool setting_append_list( &subgroup_info, parent_group); #endif - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REBOOT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REBOOT); CONFIG_ACTION( list, list_info, @@ -8067,7 +8066,7 @@ static bool setting_append_list( &group_info, &subgroup_info, parent_group); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_SHUTDOWN); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_SHUTDOWN); #endif CONFIG_ACTION( @@ -8998,7 +8997,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_AUTOSAVE_INIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_AUTOSAVE_INIT); menu_settings_list_current_add_range(list, list_info, 0, 0, 1, true, false); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_CMD_APPLY_AUTO); (*list)[list_info->index - 1].get_string_representation = @@ -9167,7 +9166,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_ok = &setting_bool_action_left_with_refresh; (*list)[list_info->index - 1].action_left = &setting_bool_action_left_with_refresh; (*list)[list_info->index - 1].action_right = &setting_bool_action_right_with_refresh; - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REWIND_TOGGLE); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REWIND_TOGGLE); CONFIG_UINT( list, list_info, @@ -9270,7 +9269,7 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - config_uint_cbs(cheat_manager_state.working_cheat.idx, CHEAT_IDX, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.idx, CHEAT_IDX, NULL,NULL, 0,&setting_get_string_representation_uint,0,cheat_manager_get_size()-1,1); @@ -9317,7 +9316,7 @@ static bool setting_append_list( general_read_handler); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ALLOW_INPUT); - config_uint_cbs(cheat_manager_state.working_cheat.handler, CHEAT_HANDLER, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.handler, CHEAT_HANDLER, setting_uint_action_left_with_refresh,setting_uint_action_right_with_refresh, MENU_ENUM_LABEL_CHEAT_HANDLER_TYPE_EMU, &setting_get_string_representation_uint_as_enum, @@ -9337,31 +9336,31 @@ static bool setting_append_list( general_write_handler, general_read_handler); - config_uint_cbs(cheat_manager_state.working_cheat.memory_search_size, CHEAT_MEMORY_SEARCH_SIZE, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.memory_search_size, CHEAT_MEMORY_SEARCH_SIZE, setting_uint_action_left_with_refresh,setting_uint_action_right_with_refresh, MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_1, &setting_get_string_representation_uint_as_enum, 0,5,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - config_uint_cbs(cheat_manager_state.working_cheat.cheat_type, CHEAT_TYPE, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.cheat_type, CHEAT_TYPE, setting_uint_action_left_default,setting_uint_action_right_default, MENU_ENUM_LABEL_CHEAT_TYPE_DISABLED, &setting_get_string_representation_uint_as_enum, CHEAT_TYPE_DISABLED,CHEAT_TYPE_RUN_NEXT_IF_GT,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - config_uint_cbs(cheat_manager_state.working_cheat.value, CHEAT_VALUE, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.value, CHEAT_VALUE, setting_uint_action_left_default,setting_uint_action_right_default, 0,&setting_get_string_representation_hex_and_uint,0,(int) pow(2,pow((double) 2,cheat_manager_state.working_cheat.memory_search_size))-1,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - config_uint_cbs(cheat_manager_state.working_cheat.address, CHEAT_ADDRESS, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.address, CHEAT_ADDRESS, setting_uint_action_left_with_refresh,setting_uint_action_right_with_refresh, 0,&setting_get_string_representation_hex_and_uint,0,cheat_manager_state.total_memory_size==0?0:cheat_manager_state.total_memory_size-1,1); max_bit_position = cheat_manager_state.working_cheat.memory_search_size<3 ? 255 : 0; - config_uint_cbs(cheat_manager_state.working_cheat.address_mask, CHEAT_ADDRESS_BIT_POSITION, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.address_mask, CHEAT_ADDRESS_BIT_POSITION, setting_uint_action_left_default,setting_uint_action_right_default, 0,&setting_get_string_representation_hex_and_uint,0,max_bit_position,1); @@ -9380,54 +9379,54 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); - config_uint_cbs(cheat_manager_state.working_cheat.repeat_count, CHEAT_REPEAT_COUNT, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.repeat_count, CHEAT_REPEAT_COUNT, setting_uint_action_left_default,setting_uint_action_right_default, 0,&setting_get_string_representation_hex_and_uint,1,2048,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - config_uint_cbs(cheat_manager_state.working_cheat.repeat_add_to_address, CHEAT_REPEAT_ADD_TO_ADDRESS, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.repeat_add_to_address, CHEAT_REPEAT_ADD_TO_ADDRESS, setting_uint_action_left_default,setting_uint_action_right_default, 0,&setting_get_string_representation_hex_and_uint,1,2048,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - config_uint_cbs(cheat_manager_state.working_cheat.repeat_add_to_value, CHEAT_REPEAT_ADD_TO_VALUE, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.repeat_add_to_value, CHEAT_REPEAT_ADD_TO_VALUE, setting_uint_action_left_default,setting_uint_action_right_default, 0,&setting_get_string_representation_hex_and_uint,0,0xFFFF,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - config_uint_cbs(cheat_manager_state.working_cheat.rumble_type, CHEAT_RUMBLE_TYPE, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_type, CHEAT_RUMBLE_TYPE, setting_uint_action_left_default,setting_uint_action_right_default, MENU_ENUM_LABEL_RUMBLE_TYPE_DISABLED, &setting_get_string_representation_uint_as_enum, RUMBLE_TYPE_DISABLED,RUMBLE_TYPE_END_LIST-1,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - config_uint_cbs(cheat_manager_state.working_cheat.rumble_value, CHEAT_RUMBLE_VALUE, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_value, CHEAT_RUMBLE_VALUE, setting_uint_action_left_default,setting_uint_action_right_default, 0,&setting_get_string_representation_hex_and_uint,0,(int) pow(2,pow((double) 2,cheat_manager_state.working_cheat.memory_search_size))-1,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - config_uint_cbs(cheat_manager_state.working_cheat.rumble_port, CHEAT_RUMBLE_PORT, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_port, CHEAT_RUMBLE_PORT, setting_uint_action_left_default,setting_uint_action_right_default, MENU_ENUM_LABEL_RUMBLE_PORT_0, &setting_get_string_representation_uint_as_enum, 0,16,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - config_uint_cbs(cheat_manager_state.working_cheat.rumble_primary_strength, CHEAT_RUMBLE_PRIMARY_STRENGTH, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_primary_strength, CHEAT_RUMBLE_PRIMARY_STRENGTH, setting_uint_action_left_default,setting_uint_action_right_default, 0,&setting_get_string_representation_hex_and_uint,0,65535,1); - config_uint_cbs(cheat_manager_state.working_cheat.rumble_primary_duration, CHEAT_RUMBLE_PRIMARY_DURATION, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_primary_duration, CHEAT_RUMBLE_PRIMARY_DURATION, setting_uint_action_left_default,setting_uint_action_right_default, 0,&setting_get_string_representation_uint,0,5000,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - config_uint_cbs(cheat_manager_state.working_cheat.rumble_secondary_strength, CHEAT_RUMBLE_SECONDARY_STRENGTH, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_secondary_strength, CHEAT_RUMBLE_SECONDARY_STRENGTH, setting_uint_action_left_default,setting_uint_action_right_default, 0,&setting_get_string_representation_hex_and_uint,0,65535,1); - config_uint_cbs(cheat_manager_state.working_cheat.rumble_secondary_duration, CHEAT_RUMBLE_SECONDARY_DURATION, + CONFIG_UINT_CBS(cheat_manager_state.working_cheat.rumble_secondary_duration, CHEAT_RUMBLE_SECONDARY_DURATION, setting_uint_action_left_default,setting_uint_action_right_default, 0,&setting_get_string_representation_uint,0,5000,1); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; @@ -9446,7 +9445,7 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - config_uint_cbs(cheat_manager_state.search_bit_size, CHEAT_START_OR_RESTART, + CONFIG_UINT_CBS(cheat_manager_state.search_bit_size, CHEAT_START_OR_RESTART, setting_uint_action_left_with_refresh,setting_uint_action_right_with_refresh, MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_1, &setting_get_string_representation_uint_as_enum, @@ -9774,7 +9773,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); menu_settings_list_current_add_range(list, list_info, 0, 1, 1, true, false); (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_video_monitor_index; @@ -9896,7 +9895,7 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_CMD_APPLY_AUTO); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT_FROM_TOGGLE); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT_FROM_TOGGLE); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); { @@ -10022,7 +10021,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_CMD_APPLY_AUTO | SD_FLAG_ADVANCED ); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); } END_SUB_GROUP(list, list_info, parent_group); @@ -10038,7 +10037,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_cmd( + MENU_SETTINGS_LIST_CURRENT_ADD_CMD( list, list_info, CMD_EVENT_VIDEO_SET_ASPECT_RATIO); @@ -10069,7 +10068,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_cmd( + MENU_SETTINGS_LIST_CURRENT_ADD_CMD( list, list_info, CMD_EVENT_VIDEO_SET_ASPECT_RATIO); @@ -10087,7 +10086,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, -99999, 0, 1, false, false); - menu_settings_list_current_add_cmd( + MENU_SETTINGS_LIST_CURRENT_ADD_CMD( list, list_info, CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); @@ -10105,7 +10104,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); menu_settings_list_current_add_range(list, list_info, -99999, 0, 1, false, false); - menu_settings_list_current_add_cmd( + MENU_SETTINGS_LIST_CURRENT_ADD_CMD( list, list_info, CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); @@ -10144,7 +10143,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_start = &setting_action_start_custom_viewport_width; (*list)[list_info->index - 1].action_left = setting_uint_action_left_custom_viewport_width; (*list)[list_info->index - 1].action_right = setting_uint_action_right_custom_viewport_width; - menu_settings_list_current_add_cmd( + MENU_SETTINGS_LIST_CURRENT_ADD_CMD( list, list_info, CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); @@ -10168,7 +10167,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_start = &setting_action_start_custom_viewport_height; (*list)[list_info->index - 1].action_left = setting_uint_action_left_custom_viewport_height; (*list)[list_info->index - 1].action_right = setting_uint_action_right_custom_viewport_height; - menu_settings_list_current_add_cmd( + MENU_SETTINGS_LIST_CURRENT_ADD_CMD( list, list_info, CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); @@ -10269,7 +10268,7 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_NONE); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); CONFIG_BOOL( list, list_info, @@ -10303,7 +10302,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].action_ok = setting_bool_action_left_with_refresh; (*list)[list_info->index - 1].action_left = setting_bool_action_left_with_refresh; (*list)[list_info->index - 1].action_right = setting_bool_action_right_with_refresh; - menu_settings_list_current_add_cmd( + MENU_SETTINGS_LIST_CURRENT_ADD_CMD( list, list_info, CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); @@ -10379,7 +10378,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE ); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); #ifdef HAVE_ODROIDGO2 CONFIG_BOOL( @@ -10397,7 +10396,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE ); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); #endif CONFIG_UINT( @@ -10460,7 +10459,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_CMD_APPLY_AUTO ); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); #endif CONFIG_BOOL( @@ -10495,7 +10494,7 @@ static bool setting_append_list( general_read_handler); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; (*list)[list_info->index - 1].offset_by = 1; - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_VIDEO_SET_BLOCKING_STATE); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_VIDEO_SET_BLOCKING_STATE); menu_settings_list_current_add_range(list, list_info, 1, 4, 1, true, true); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_CMD_APPLY_AUTO); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); @@ -10691,8 +10690,8 @@ static bool setting_append_list( general_read_handler); (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_video_filter; - menu_settings_list_current_add_values(list, list_info, "filt"); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "filt"); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); END_SUB_GROUP(list, list_info, parent_group); @@ -11157,8 +11156,8 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_values(list, list_info, "dsp"); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_DSP_FILTER_INIT); + MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "dsp"); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_DSP_FILTER_INIT); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); #ifdef HAVE_WASAPI @@ -11790,7 +11789,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_values(list, list_info, "cfg"); + MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "cfg"); CONFIG_STRING( list, list_info, @@ -11867,7 +11866,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_values(list, list_info, "cfg"); + MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "cfg"); (*list)[list_info->index - 1].ui_type = ST_UI_TYPE_FILE_SELECTOR; CONFIG_STRING( @@ -12015,7 +12014,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_SET_FRAME_LIMIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_SET_FRAME_LIMIT); menu_settings_list_current_add_range(list, list_info, 0, 10, 1.0, true, true); CONFIG_BOOL( @@ -12273,7 +12272,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_values(list, list_info, "ttf"); + MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "ttf"); CONFIG_FLOAT( list, list_info, @@ -12588,8 +12587,8 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_values(list, list_info, "cfg"); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_OVERLAY_INIT); + MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "cfg"); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_OVERLAY_INIT); CONFIG_FLOAT( list, list_info, @@ -12604,7 +12603,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_OVERLAY_SET_ALPHA_MOD); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_OVERLAY_SET_ALPHA_MOD); menu_settings_list_current_add_range(list, list_info, 0, 1, 0.01, true, true); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_CMD_APPLY_AUTO); @@ -12621,7 +12620,7 @@ static bool setting_append_list( general_write_handler, general_read_handler); (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint; - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_OVERLAY_SET_SCALE_FACTOR); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_OVERLAY_SET_SCALE_FACTOR); menu_settings_list_current_add_range(list, list_info, 0, 2, 0.01, true, true); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_CMD_APPLY_AUTO); @@ -12716,7 +12715,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_values(list, list_info, "png"); + MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "png"); CONFIG_FLOAT( list, list_info, @@ -12789,7 +12788,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_CMD_APPLY_AUTO ); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_MENU_PAUSE_LIBRETRO); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_MENU_PAUSE_LIBRETRO); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); CONFIG_BOOL( @@ -13024,7 +13023,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_values(list, list_info, "cfg"); + MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "cfg"); CONFIG_BOOL( list, list_info, @@ -13383,8 +13382,8 @@ static bool setting_append_list( general_write_handler, general_read_handler); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); - menu_settings_list_current_add_values(list, list_info, "ttf"); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "ttf"); (*list)[list_info->index - 1].ui_type = ST_UI_TYPE_FONT_SELECTOR; CONFIG_UINT( @@ -13446,7 +13445,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_xmb_layout; menu_settings_list_current_add_range(list, list_info, 0, 2, 1, true, true); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); (*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX; CONFIG_UINT( @@ -13463,7 +13462,7 @@ static bool setting_append_list( (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_xmb_icon_theme; menu_settings_list_current_add_range(list, list_info, 0, XMB_ICON_THEME_LAST - 1, 1, true, true); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); (*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX; CONFIG_BOOL( @@ -14814,7 +14813,7 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_CMD_APPLY_AUTO); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); #endif @@ -14861,7 +14860,7 @@ static bool setting_append_list( general_write_handler, general_read_handler, SD_FLAG_CMD_APPLY_AUTO); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT_FROM_TOGGLE); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_REINIT_FROM_TOGGLE); #endif #ifdef HAVE_NETWORKING @@ -16058,7 +16057,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE ); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_CHEEVOS_HARDCORE_MODE_TOGGLE); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_CHEEVOS_HARDCORE_MODE_TOGGLE); END_SUB_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group); @@ -17014,7 +17013,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_CORE_INFO_INIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_CORE_INFO_INIT); (*list)[list_info->index - 1].action_start = directory_action_start_generic; CONFIG_DIR( @@ -17030,7 +17029,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_CORE_INFO_INIT); + MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info, CMD_EVENT_CORE_INFO_INIT); (*list)[list_info->index - 1].action_start = directory_action_start_generic; #ifdef HAVE_LIBRETRODB @@ -17520,7 +17519,7 @@ static bool setting_append_list( parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_values(list, list_info, "dat|xml"); + MENU_SETTINGS_LIST_CURRENT_ADD_VALUES(list, list_info, "dat|xml"); CONFIG_BOOL( list, list_info, @@ -17711,7 +17710,7 @@ static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_inf list_ptr = &list; - if (!settings_list_append(list_ptr, list_info)) + if (!SETTINGS_LIST_APPEND(list_ptr, list_info)) { free(list); return NULL; @@ -17877,7 +17876,7 @@ void video_driver_menu_settings(void **list_data, void *list_info_data, parent_group, general_write_handler, general_read_handler); - menu_settings_list_current_add_cmd( + MENU_SETTINGS_LIST_CURRENT_ADD_CMD( list, list_info, CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); @@ -17907,7 +17906,7 @@ void video_driver_menu_settings(void **list_data, void *list_info_data, general_write_handler, general_read_handler, SD_FLAG_NONE); - menu_settings_list_current_add_cmd( + MENU_SETTINGS_LIST_CURRENT_ADD_CMD( list, list_info, CMD_EVENT_VIDEO_APPLY_STATE_CHANGES);