ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Menu) Convert more settings over

This commit is contained in:
twinaphex 2014-07-17 01:00:46 +02:00
parent 08c7e9711a
commit 2ef607df92
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,10 +209,16 @@ static void menu_common_entries_init(void *data, unsigned menu_type)
file_list_push(menu->selection_buf, "Integer Scale", MENU_SETTINGS_VIDEO_INTEGER_SCALE, 0); file_list_push(menu->selection_buf, "Integer Scale", MENU_SETTINGS_VIDEO_INTEGER_SCALE, 0);
file_list_push(menu->selection_buf, "Aspect Ratio", MENU_SETTINGS_VIDEO_ASPECT_RATIO, 0); file_list_push(menu->selection_buf, "Aspect Ratio", MENU_SETTINGS_VIDEO_ASPECT_RATIO, 0);
file_list_push(menu->selection_buf, "Custom Ratio", MENU_SETTINGS_CUSTOM_VIEWPORT, 0); file_list_push(menu->selection_buf, "Custom Ratio", MENU_SETTINGS_CUSTOM_VIEWPORT, 0);
#if !defined(RARCH_CONSOLE) && !defined(RARCH_MOBILE) if ((current_setting = setting_data_find_setting(setting_data, "video_fullscreen")))
file_list_push(menu->selection_buf, "Toggle Fullscreen", MENU_SETTINGS_TOGGLE_FULLSCREEN, 0); {
#endif *current_setting->value.boolean = g_settings.video.fullscreen;
file_list_push(menu->selection_buf, "Rotation", MENU_SETTINGS_VIDEO_ROTATION, 0); file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_TOGGLE_FULLSCREEN, 0);
}
if ((current_setting = setting_data_find_setting(setting_data, "video_rotation")))
{
*current_setting->value.unsigned_integer = g_settings.video.rotation;
file_list_push(menu->selection_buf, current_setting->short_description, MENU_SETTINGS_VIDEO_ROTATION, 0);
}
file_list_push(menu->selection_buf, "VSync", MENU_SETTINGS_VIDEO_VSYNC, 0); file_list_push(menu->selection_buf, "VSync", MENU_SETTINGS_VIDEO_VSYNC, 0);
file_list_push(menu->selection_buf, "Hard GPU Sync", MENU_SETTINGS_VIDEO_HARD_SYNC, 0); file_list_push(menu->selection_buf, "Hard GPU Sync", MENU_SETTINGS_VIDEO_HARD_SYNC, 0);
file_list_push(menu->selection_buf, "Hard GPU Sync Frames", MENU_SETTINGS_VIDEO_HARD_SYNC_FRAMES, 0); file_list_push(menu->selection_buf, "Hard GPU Sync Frames", MENU_SETTINGS_VIDEO_HARD_SYNC_FRAMES, 0);
@ -4268,22 +4274,23 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
*g_settings.input.autoconfig_dir = '\0'; *g_settings.input.autoconfig_dir = '\0';
break; break;
case MENU_SETTINGS_VIDEO_ROTATION: case MENU_SETTINGS_VIDEO_ROTATION:
if (action == MENU_ACTION_START) if ((current_setting = setting_data_find_setting(setting_data, "video_rotation")))
{ {
g_settings.video.rotation = ORIENTATION_NORMAL; if (action == MENU_ACTION_START)
video_set_rotation_func((g_settings.video.rotation + g_extern.system.rotation) % 4); *current_setting->value.unsigned_integer = ORIENTATION_NORMAL;
} else if (action == MENU_ACTION_LEFT)
else if (action == MENU_ACTION_LEFT) {
{ if (*current_setting->value.unsigned_integer > 0)
if (g_settings.video.rotation > 0) *current_setting->value.unsigned_integer = *current_setting->value.unsigned_integer - 1;
g_settings.video.rotation--; }
video_set_rotation_func((g_settings.video.rotation + g_extern.system.rotation) % 4); else if (action == MENU_ACTION_RIGHT)
} {
else if (action == MENU_ACTION_RIGHT) if (*current_setting->value.unsigned_integer < LAST_ORIENTATION)
{ *current_setting->value.unsigned_integer = *current_setting->value.unsigned_integer + 1;
if (g_settings.video.rotation < LAST_ORIENTATION) }
g_settings.video.rotation++;
video_set_rotation_func((g_settings.video.rotation + g_extern.system.rotation) % 4); if (current_setting->change_handler)
current_setting->change_handler(current_setting);
} }
break; break;
@ -4419,10 +4426,14 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
break; break;
case MENU_SETTINGS_TOGGLE_FULLSCREEN: case MENU_SETTINGS_TOGGLE_FULLSCREEN:
if (action == MENU_ACTION_OK) if ((current_setting = setting_data_find_setting(setting_data, "video_fullscreen")))
{ {
g_settings.video.fullscreen = !g_settings.video.fullscreen; if (action == MENU_ACTION_OK)
rarch_reinit_drivers(); {
*current_setting->value.boolean = !(*current_setting->value.boolean);
if (current_setting->change_handler)
current_setting->change_handler(current_setting);
}
} }
break; break;

2
settings_data.c
View File

@ -830,7 +830,9 @@ rarch_setting_t* setting_data_get_list(void)
START_GROUP("Video Options") START_GROUP("Video Options")
START_SUB_GROUP("Monitor") START_SUB_GROUP("Monitor")
CONFIG_UINT(g_settings.video.monitor_index, "video_monitor_index", "Monitor Index", monitor_index, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_UINT(g_settings.video.monitor_index, "video_monitor_index", "Monitor Index", monitor_index, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
#if !defined(RARCH_CONSOLE) && !defined(RARCH_MOBILE)
CONFIG_BOOL(g_settings.video.fullscreen, "video_fullscreen", "Use Fullscreen mode", fullscreen, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_BOOL(g_settings.video.fullscreen, "video_fullscreen", "Use Fullscreen mode", fullscreen, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
#endif
CONFIG_BOOL(g_settings.video.windowed_fullscreen, "video_windowed_fullscreen", "Windowed Fullscreen Mode", windowed_fullscreen, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_BOOL(g_settings.video.windowed_fullscreen, "video_windowed_fullscreen", "Windowed Fullscreen Mode", windowed_fullscreen, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_UINT(g_settings.video.fullscreen_x, "video_fullscreen_x", "Fullscreen Width", fullscreen_x, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_UINT(g_settings.video.fullscreen_x, "video_fullscreen_x", "Fullscreen Width", fullscreen_x, GROUP_NAME, SUBGROUP_NAME, general_change_handler)
CONFIG_UINT(g_settings.video.fullscreen_y, "video_fullscreen_y", "Fullscreen Height", fullscreen_y, GROUP_NAME, SUBGROUP_NAME, general_change_handler) CONFIG_UINT(g_settings.video.fullscreen_y, "video_fullscreen_y", "Fullscreen Height", fullscreen_y, GROUP_NAME, SUBGROUP_NAME, general_change_handler)