Reimplement video resolution callbacks

This commit is contained in:
twinaphex 2015-06-25 05:35:23 +02:00
parent 8a97c2ac2f
commit cc2f2a5735
4 changed files with 11 additions and 10 deletions

View File

@ -894,6 +894,10 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
cbs->action_get_value =
menu_action_setting_disp_set_label_configurations;
break;
case MENU_LABEL_SCREEN_RESOLUTION:
cbs->action_get_value =
menu_action_setting_disp_set_label_menu_video_resolution;
break;
case MENU_LABEL_CONTENT_COLLECTION_LIST:
case MENU_LABEL_LOAD_CONTENT_HISTORY:
case MENU_LABEL_DETECT_CORE_LIST:
@ -1045,10 +1049,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_type(
cbs->action_get_value =
menu_action_setting_disp_set_label_menu_disk_index;
break;
case MENU_SETTINGS_VIDEO_RESOLUTION:
cbs->action_get_value =
menu_action_setting_disp_set_label_menu_video_resolution;
break;
default:
cbs->action_get_value = menu_action_setting_disp_set_label;
break;

View File

@ -398,6 +398,9 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_CHEAT_NUM_PASSES:
cbs->action_left = action_left_cheat_num_passes;
break;
case MENU_LABEL_SCREEN_RESOLUTION:
cbs->action_left = action_left_video_resolution;
break;
default:
return -1;
}
@ -421,8 +424,6 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
else if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
&& type <= MENU_SETTINGS_INPUT_DESC_END)
cbs->action_left = action_left_input_desc;
else if (type == MENU_SETTINGS_VIDEO_RESOLUTION)
cbs->action_left = action_left_video_resolution;
else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
cbs->action_left = core_setting_left;
else

View File

@ -355,8 +355,6 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
else if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
&& type <= MENU_SETTINGS_INPUT_DESC_END)
cbs->action_right = action_right_input_desc;
else if (type == MENU_SETTINGS_VIDEO_RESOLUTION)
cbs->action_right = action_right_video_resolution;
else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
cbs->action_right = core_setting_right;
else
@ -470,6 +468,9 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_CHEAT_NUM_PASSES:
cbs->action_right = action_right_cheat_num_passes;
break;
case MENU_LABEL_SCREEN_RESOLUTION:
cbs->action_right = action_right_video_resolution;
break;
default:
return -1;
}

View File

@ -112,8 +112,7 @@ typedef enum
typedef enum
{
MENU_SETTINGS_VIDEO_RESOLUTION = MENU_FILE_TYPE_T_LAST + 1,
MENU_SETTINGS_CUSTOM_VIEWPORT,
MENU_SETTINGS_CUSTOM_VIEWPORT = MENU_FILE_TYPE_T_LAST + 1,
MENU_SETTINGS_SHADER_PARAMETER_0,
MENU_SETTINGS_SHADER_PARAMETER_LAST = MENU_SETTINGS_SHADER_PARAMETER_0 + (GFX_MAX_PARAMETERS - 1),
MENU_SETTINGS_SHADER_PRESET_PARAMETER_0,