Move 'Allow Rotation' to 'Core Settings'

This commit is contained in:
twinaphex 2016-11-21 09:01:56 +01:00
parent ef11d95be9
commit 2260fdd7f9
2 changed files with 10 additions and 20 deletions

View File

@ -5219,9 +5219,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_VIDEO_GPU_SCREENSHOT,
PARSE_ONLY_BOOL, false);
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE,
PARSE_ONLY_BOOL, false);
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_VIDEO_CROP_OVERSCAN,
PARSE_ONLY_BOOL, false);
@ -5239,6 +5236,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN,
PARSE_ONLY_BOOL, false);
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE,
PARSE_ONLY_BOOL, false);
info->need_refresh = true;
info->need_push = true;

View File

@ -2704,7 +2704,7 @@ static bool setting_append_list(
case SETTINGS_LIST_CORE:
{
unsigned i;
struct bool_entry bool_entries[3];
struct bool_entry bool_entries[4];
START_GROUP(list, list_info, &group_info,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_SETTINGS), parent_group);
@ -2735,6 +2735,12 @@ static bool setting_append_list(
bool_entries[2].default_value = true;
bool_entries[2].flags = SD_FLAG_ADVANCED;
bool_entries[3].target = &settings->video.allow_rotate;
bool_entries[3].name_enum_idx = MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE;
bool_entries[3].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE;
bool_entries[3].default_value = allow_rotate;
bool_entries[3].flags = SD_FLAG_ADVANCED;
for (i = 0; i < ARRAY_SIZE(bool_entries); i++)
{
CONFIG_BOOL(
@ -3563,22 +3569,6 @@ static bool setting_append_list(
);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_BOOL(
list, list_info,
&settings->video.allow_rotate,
MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE,
MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE,
allow_rotate,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_ADVANCED
);
CONFIG_BOOL(
list, list_info,
&settings->video.crop_overscan,