mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Refactor aspect_ratio_idx setting

Browse Source
This commit is contained in:
twinaphex 2014-07-18 04:50:55 +02:00
parent eb374cbcec
commit 31122bd09e
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,7 +269,11 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
*current_setting->value.boolean = g_settings.video.scale_integer;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_VIDEO_INTEGER_SCALE, 0);
}
file_list_push(menu->selection_buf, "Aspect Ratio", MENU_SETTINGS_VIDEO_ASPECT_RATIO, 0);
if ((current_setting = setting_data_find_setting(setting_data, "aspect_ratio_index")))
{
*current_setting->value.unsigned_integer = g_settings.video.aspect_ratio_idx;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_VIDEO_ASPECT_RATIO, 0);
}
file_list_push(menu->selection_buf, "Custom Ratio", MENU_SETTINGS_CUSTOM_VIEWPORT, 0);
if ((current_setting = setting_data_find_setting(setting_data, "video_fullscreen")))
{
@ -3788,7 +3792,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
rarch_save_state();
else
{
// Disallow savestate load when we absoluetely cannot change game state.
// Disallow savestate load when we absolutely cannot change game state.
#ifdef HAVE_BSV_MOVIE
if (g_extern.bsv.movie)
break;
@ -4414,23 +4418,9 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
break;
case MENU_SETTINGS_VIDEO_ASPECT_RATIO:
if (action == MENU_ACTION_START)
g_settings.video.aspect_ratio_idx = aspect_ratio_idx;
else if (action == MENU_ACTION_LEFT)
{
if (g_settings.video.aspect_ratio_idx > 0)
g_settings.video.aspect_ratio_idx--;
}
else if (action == MENU_ACTION_RIGHT)
{
if (g_settings.video.aspect_ratio_idx < LAST_ASPECT_RATIO)
g_settings.video.aspect_ratio_idx++;
}
if (driver.video_data && driver.video_poke && driver.video_poke->set_aspect_ratio)
driver.video_poke->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx);
if ((current_setting = setting_data_find_setting(setting_data, "aspect_ratio_index")))
menu_common_setting_set_current_unsigned_integer(current_setting, 1, action, true, true);
break;
case MENU_SETTINGS_TOGGLE_FULLSCREEN:
if ((current_setting = setting_data_find_setting(setting_data, "video_fullscreen")))
menu_common_setting_set_current_boolean(current_setting, action);

2
settings_data.c
View File

@ -888,7 +888,7 @@ rarch_setting_t* setting_data_get_list(void)
CONFIG_BOOL(g_settings.video.force_aspect, "video_force_aspect", "Force aspect ratio", force_aspect, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_FLOAT(g_settings.video.aspect_ratio, "video_aspect_ratio", "Aspect Ratio", aspect_ratio, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_BOOL(g_settings.video.aspect_ratio_auto, "video_aspect_ratio_auto", "Use Auto Aspect Ratio", aspect_ratio_auto, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_UINT(g_settings.video.aspect_ratio_idx, "aspect_ratio_index", "Aspect Ratio Index", aspect_ratio_idx, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_UINT(g_settings.video.aspect_ratio_idx, "aspect_ratio_index", "Aspect Ratio Index", aspect_ratio_idx, GROUP_NAME, SUBGROUP_NAME, general_change_handler) WITH_RANGE(0, LAST_ASPECT_RATIO)
END_SUB_GROUP()
START_SUB_GROUP("Scaling")