From c34e5428c0287302e23a95f1d42771531ee9a32c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 16 Aug 2014 18:46:43 +0200 Subject: [PATCH] (Menu) Go through RARCH_CMD_VIDEO_SET_ASPECT_RATIO --- dynamic.c | 3 +-- frontend/menu/backend/menu_common_backend.c | 5 ++--- frontend/menu/menu_common.c | 3 +-- general.h | 1 + retroarch.c | 4 ++++ settings_data.c | 4 +--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dynamic.c b/dynamic.c index cd2db39724..079ecbe2bc 100644 --- a/dynamic.c +++ b/dynamic.c @@ -946,8 +946,7 @@ bool rarch_environment_cb(unsigned cmd, void *data) geom->base_width, geom->base_height, geom->aspect_ratio); // Forces recomputation of aspect ratios if using core-dependent aspect ratios. - if (driver.video_poke && driver.video_poke->set_aspect_ratio && driver.video_data) - driver.video_poke->set_aspect_ratio(driver.video_data, g_settings.video.aspect_ratio_idx); + rarch_main_command(RARCH_CMD_VIDEO_SET_ASPECT_RATIO); // TODO: Figure out what to do, if anything, with recording. } diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index 1048ade4f1..e0ff2abd12 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -1266,9 +1266,8 @@ static int menu_settings_iterate(unsigned action, rarch_setting_t *setting) aspectratio_lut[ASPECT_RATIO_CUSTOM].value = (float)custom->width / custom->height; g_settings.video.aspect_ratio_idx = ASPECT_RATIO_CUSTOM; - 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); + + rarch_main_command(RARCH_CMD_VIDEO_SET_ASPECT_RATIO); } else { diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index ff5942a24e..5315541cb7 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -222,8 +222,7 @@ bool load_menu_content(void) if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->shader_manager_init) driver.menu_ctx->backend->shader_manager_init(driver.menu); - 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); + rarch_main_command(RARCH_CMD_VIDEO_SET_ASPECT_RATIO); g_extern.lifecycle_state |= (1ULL << MODE_GAME); diff --git a/general.h b/general.h index 560e01effe..1b26e79051 100644 --- a/general.h +++ b/general.h @@ -118,6 +118,7 @@ enum basic_event RARCH_CMD_VIDEO_APPLY_STATE_CHANGES, RARCH_CMD_VIDEO_SET_BLOCKING_STATE, RARCH_CMD_VIDEO_SET_NONBLOCKING_STATE, + RARCH_CMD_VIDEO_SET_ASPECT_RATIO, }; enum menu_enums diff --git a/retroarch.c b/retroarch.c index 82e8659699..a47a3986e0 100644 --- a/retroarch.c +++ b/retroarch.c @@ -3242,6 +3242,10 @@ void rarch_main_command(unsigned action) if (driver.video && driver.video->set_nonblock_state) driver.video->set_nonblock_state(driver.video_data, boolean); break; + case RARCH_CMD_VIDEO_SET_ASPECT_RATIO: + 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); + break; } } diff --git a/settings_data.c b/settings_data.c index 5dd4dbfe76..9121e6e1e8 100644 --- a/settings_data.c +++ b/settings_data.c @@ -1311,9 +1311,7 @@ static void general_write_handler(const void *data) else if (!strcmp(setting->name, "aspect_ratio_index")) { g_settings.video.aspect_ratio_idx = *setting->value.unsigned_integer; - - 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); + rarch_cmd = RARCH_CMD_VIDEO_SET_ASPECT_RATIO; } else if (!strcmp(setting->name, "video_message_pos_x")) g_settings.video.msg_pos_x = *setting->value.fraction;