diff --git a/360/main.c b/360/main.c index 23df58e16e..6968c67343 100644 --- a/360/main.c +++ b/360/main.c @@ -169,7 +169,6 @@ static void set_default_settings (void) g_console.screen_orientation = ORIENTATION_NORMAL; g_console.throttle_enable = true; g_console.aspect_ratio_index = 0; - strlcpy(g_console.aspect_ratio_name, "4:3", sizeof(g_console.aspect_ratio_name)); strlcpy(g_console.default_rom_startup_dir, "game:", sizeof(g_console.default_rom_startup_dir)); g_console.custom_viewport_width = 0; g_console.custom_viewport_height = 0; @@ -328,7 +327,6 @@ static void init_settings (bool load_libretro_path) CONFIG_GET_STRING_CONSOLE(default_rom_startup_dir, "default_rom_startup_dir"); CONFIG_GET_INT_CONSOLE(aspect_ratio_index, "aspect_ratio_index"); CONFIG_GET_INT_CONSOLE(screen_orientation, "screen_orientation"); - CONFIG_GET_STRING_CONSOLE(aspect_ratio_name, "aspect_ratio_name"); // g_extern CONFIG_GET_INT_EXTERN(state_slot, "state_slot"); @@ -365,7 +363,6 @@ static void save_settings (void) config_set_int(conf, "custom_viewport_x", g_console.custom_viewport_x); config_set_int(conf, "custom_viewport_y", g_console.custom_viewport_y); config_set_int(conf, "screen_orientation", g_console.screen_orientation); - config_set_string(conf, "aspect_ratio_name", g_console.aspect_ratio_name); // g_extern config_set_int(conf, "state_slot", g_extern.state_slot); diff --git a/360/menu.cpp b/360/menu.cpp index 1fe80283e6..060b29ddea 100644 --- a/360/menu.cpp +++ b/360/menu.cpp @@ -163,7 +163,7 @@ HRESULT CSSNESQuickMenu::OnInit(XUIMessageInit * pInitData, BOOL& bHandled) break; } char aspectratio_label[32]; - sprintf(aspectratio_label, "Aspect Ratio: %s", g_console.aspect_ratio_name); + sprintf(aspectratio_label, "Aspect Ratio: %s", aspectratio_lut[g_console.aspect_ratio_index].name); unsigned long dwNum = MultiByteToWideChar(CP_ACP, 0, aspectratio_label, -1, NULL, 0); wchar_t * aspectratio_label_w = new wchar_t[dwNum]; MultiByteToWideChar(CP_ACP, 0, aspectratio_label, -1, aspectratio_label_w, dwNum); @@ -210,7 +210,7 @@ HRESULT CSSNESQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled ) video_xdk360.set_aspect_ratio(NULL, g_console.aspect_ratio_index); char aspectratio_label[32]; - sprintf(aspectratio_label, "Aspect Ratio: %s", g_console.aspect_ratio_name); + sprintf(aspectratio_label, "Aspect Ratio: %s", aspectratio_lut[g_console.aspect_ratio_index].name); unsigned long dwNum = MultiByteToWideChar(CP_ACP, 0, aspectratio_label, -1, NULL, 0); wchar_t * aspectratio_label_w = new wchar_t[dwNum]; MultiByteToWideChar(CP_ACP, 0, aspectratio_label, -1, aspectratio_label_w, dwNum); diff --git a/360/xdk360_video.cpp b/360/xdk360_video.cpp index 1add6ea97a..33b286f374 100644 --- a/360/xdk360_video.cpp +++ b/360/xdk360_video.cpp @@ -305,92 +305,7 @@ static void xdk360_set_aspect_ratio(void * data, uint32_t aspectratio_index) { (void)data; - switch(aspectratio_index) - { - case ASPECT_RATIO_4_3: - g_settings.video.aspect_ratio = 1.33333333333; - strlcpy(g_console.aspect_ratio_name, "4:3", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_4_4: - g_settings.video.aspect_ratio = 1.0; - strlcpy(g_console.aspect_ratio_name, "4:4", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_4_1: - g_settings.video.aspect_ratio = 4.0; - strlcpy(g_console.aspect_ratio_name, "4:1", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_5_4: - g_settings.video.aspect_ratio = 1.25; - strlcpy(g_console.aspect_ratio_name, "5:4", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_6_5: - g_settings.video.aspect_ratio = 1.2; - strlcpy(g_console.aspect_ratio_name, "6:5", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_7_9: - g_settings.video.aspect_ratio = 0.77777777777; - strlcpy(g_console.aspect_ratio_name, "7:9", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_8_3: - g_settings.video.aspect_ratio = 2.66666666666; - strlcpy(g_console.aspect_ratio_name, "8:3", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_8_7: - g_settings.video.aspect_ratio = 1.14287142857; - strlcpy(g_console.aspect_ratio_name, "8:7", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_16_9: - g_settings.video.aspect_ratio = 1.777778; - strlcpy(g_console.aspect_ratio_name, "16:9", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_16_10: - g_settings.video.aspect_ratio = 1.6; - strlcpy(g_console.aspect_ratio_name, "16:10", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_16_15: - g_settings.video.aspect_ratio = 3.2; - strlcpy(g_console.aspect_ratio_name, "16:15", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_19_12: - g_settings.video.aspect_ratio = 1.58333333333; - strlcpy(g_console.aspect_ratio_name, "19:12", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_19_14: - g_settings.video.aspect_ratio = 1.35714285714; - strlcpy(g_console.aspect_ratio_name, "19:14", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_30_17: - g_settings.video.aspect_ratio = 1.76470588235; - strlcpy(g_console.aspect_ratio_name, "30:17", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_32_9: - g_settings.video.aspect_ratio = 3.55555555555; - strlcpy(g_console.aspect_ratio_name, "32:9", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_2_1: - g_settings.video.aspect_ratio = 2.0; - strlcpy(g_console.aspect_ratio_name, "2:1", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_3_2: - g_settings.video.aspect_ratio = 1.5; - strlcpy(g_console.aspect_ratio_name, "3:2", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_3_4: - g_settings.video.aspect_ratio = 0.75; - strlcpy(g_console.aspect_ratio_name, "3:4", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_1_1: - g_settings.video.aspect_ratio = 1.0; - strlcpy(g_console.aspect_ratio_name, "1:1", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_AUTO: - strlcpy(g_console.aspect_ratio_name, "(Auto)", sizeof(g_console.aspect_ratio_name)); - break; - case ASPECT_RATIO_CUSTOM: - strlcpy(g_console.aspect_ratio_name, "(Custom)", sizeof(g_console.aspect_ratio_name)); - break; - } - + g_settings.video.aspect_ratio = aspectratio_lut[g_console.aspect_ratio_index].value; g_settings.video.force_aspect = false; set_viewport(false); }