Merge pull request #567 from ggrtk/aspect-ratio-setting

HostInterface: Save default setting to AspectRatio, not PixelAspectRatio
This commit is contained in:
Connor McLaughlin 2020-06-24 12:23:46 +10:00 committed by GitHub
commit e6f5009245
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View file

@ -342,7 +342,7 @@ void HostInterface::SetDefaultSettings(SettingsInterface& si)
si.SetBoolValue("GPU", "ForceNTSCTimings", false); si.SetBoolValue("GPU", "ForceNTSCTimings", false);
si.SetStringValue("Display", "CropMode", "Overscan"); si.SetStringValue("Display", "CropMode", "Overscan");
si.SetStringValue("Display", "PixelAspectRatio", "4:3"); si.SetStringValue("Display", "AspectRatio", "4:3");
si.SetBoolValue("Display", "LinearFiltering", true); si.SetBoolValue("Display", "LinearFiltering", true);
si.SetBoolValue("Display", "IntegerScaling", false); si.SetBoolValue("Display", "IntegerScaling", false);
si.SetBoolValue("Display", "ShowOSDMessages", true); si.SetBoolValue("Display", "ShowOSDMessages", true);

View file

@ -29,7 +29,6 @@ Log_SetChannel(LibretroHostInterface);
// - Expose the rest of the options // - Expose the rest of the options
// - Memory card and controller settings // - Memory card and controller settings
// - Better paths for memory cards/BIOS // - Better paths for memory cards/BIOS
// - Fix up aspect ratio
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
LibretroHostInterface g_libretro_host_interface; LibretroHostInterface g_libretro_host_interface;
@ -81,7 +80,7 @@ void LibretroHostInterface::retro_get_system_av_info(struct retro_system_av_info
std::memset(info, 0, sizeof(*info)); std::memset(info, 0, sizeof(*info));
info->geometry.aspect_ratio = 4.0f / 3.0f; info->geometry.aspect_ratio = Settings::GetDisplayAspectRatioValue(m_settings.display_aspect_ratio);
if (!m_system->IsPALRegion()) if (!m_system->IsPALRegion())
{ {
@ -232,9 +231,9 @@ static std::array<retro_core_option_definition, 14> s_option_definitions = {{
"hidden.", "hidden.",
{{"None", "None"}, {"Overscan", "Only Overscan Area"}, {"Borders", "All Borders"}}, {{"None", "None"}, {"Overscan", "Only Overscan Area"}, {"Borders", "All Borders"}},
"Overscan"}, "Overscan"},
{"Display.PixelAspectRatio", {"Display.AspectRatio",
"Pixel Aspect Ratio", "Aspect Ratio",
"Determines how the pixels in VRAM area are displayed on the screen.", "Sets the core-provided aspect ratio.",
{{"4:3", "4:3"}, {"16:9", "16:9"}, {"1:1", "1:1"}}, {{"4:3", "4:3"}, {"16:9", "16:9"}, {"1:1", "1:1"}},
"4:3"}, "4:3"},
{}, {},