From c1c49f6ff61b9554ecffe64d78565f585c4e4ecd Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 7 Nov 2013 00:27:30 +0100 Subject: [PATCH] (RGUI) Move Video/Audio/Input/Path Options to Settings as submenus --- frontend/menu/menu_common.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 3495fbab08..e33d4382c0 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -1878,6 +1878,15 @@ void menu_populate_entries(void *data, unsigned menu_type) break; case RGUI_SETTINGS_OPTIONS: rgui_list_clear(rgui->selection_buf); + rgui_list_push(rgui->selection_buf, "Video Options", RGUI_SETTINGS_VIDEO_OPTIONS, 0); + rgui_list_push(rgui->selection_buf, "Audio Options", RGUI_SETTINGS_AUDIO_OPTIONS, 0); + rgui_list_push(rgui->selection_buf, "Input Options", RGUI_SETTINGS_INPUT_OPTIONS, 0); + rgui_list_push(rgui->selection_buf, "Path Options", RGUI_SETTINGS_PATH_OPTIONS, 0); + if (g_extern.main_is_init && !g_extern.libretro_dummy) + { + if (g_extern.system.disk_control.get_num_images) + rgui_list_push(rgui->selection_buf, "Disk Options", RGUI_SETTINGS_DISK_OPTIONS, 0); + } rgui_list_push(rgui->selection_buf, "Rewind", RGUI_SETTINGS_REWIND_ENABLE, 0); rgui_list_push(rgui->selection_buf, "Rewind Granularity", RGUI_SETTINGS_REWIND_GRANULARITY, 0); #ifdef HAVE_SCREENSHOTS @@ -1968,17 +1977,11 @@ void menu_populate_entries(void *data, unsigned menu_type) } rgui_list_push(rgui->selection_buf, "Core Options", RGUI_SETTINGS_CORE_OPTIONS, 0); - rgui_list_push(rgui->selection_buf, "Video Options", RGUI_SETTINGS_VIDEO_OPTIONS, 0); - rgui_list_push(rgui->selection_buf, "Audio Options", RGUI_SETTINGS_AUDIO_OPTIONS, 0); - rgui_list_push(rgui->selection_buf, "Input Options", RGUI_SETTINGS_INPUT_OPTIONS, 0); - rgui_list_push(rgui->selection_buf, "Path Options", RGUI_SETTINGS_PATH_OPTIONS, 0); rgui_list_push(rgui->selection_buf, "Settings", RGUI_SETTINGS_OPTIONS, 0); rgui_list_push(rgui->selection_buf, "Drivers", RGUI_SETTINGS_DRIVERS, 0); if (g_extern.main_is_init && !g_extern.libretro_dummy) { - if (g_extern.system.disk_control.get_num_images) - rgui_list_push(rgui->selection_buf, "Disk Options", RGUI_SETTINGS_DISK_OPTIONS, 0); rgui_list_push(rgui->selection_buf, "Save State", RGUI_SETTINGS_SAVESTATE_SAVE, 0); rgui_list_push(rgui->selection_buf, "Load State", RGUI_SETTINGS_SAVESTATE_LOAD, 0); #ifdef HAVE_SCREENSHOTS