From 5337e58284aa9c727cdd66a1a79d968861a70839 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 10 Nov 2017 22:55:00 -0500 Subject: VideoConfig: Make StereoMode an enum class Makes for more strongly-typed identifiers (and doesn't pollute surrounding namespaces) --- Source/Core/DolphinWX/Frame.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Source/Core/DolphinWX/Frame.cpp') diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 1f89306a13..d1f8693417 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1549,7 +1549,7 @@ void CFrame::ParseHotkeys() if (IsHotkey(HK_TOGGLE_STEREO_SBS)) { - if (g_Config.iStereoMode != STEREO_SBS) + if (g_Config.stereo_mode != StereoMode::SBS) { // Current implementation of anaglyph stereoscopy uses a // post-processing shader. Thus the shader needs to be to be @@ -1558,56 +1558,56 @@ void CFrame::ParseHotkeys() { Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("")); } - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(STEREO_SBS)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(StereoMode::SBS)); } else { - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(STEREO_OFF)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(StereoMode::Off)); } } if (IsHotkey(HK_TOGGLE_STEREO_TAB)) { - if (g_Config.iStereoMode != STEREO_TAB) + if (g_Config.stereo_mode != StereoMode::TAB) { if (g_Config.sPostProcessingShader == "dubois") { Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("")); } - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(STEREO_TAB)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(StereoMode::TAB)); } else { - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(STEREO_OFF)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(StereoMode::Off)); } } if (IsHotkey(HK_TOGGLE_STEREO_ANAGLYPH)) { - if (g_Config.iStereoMode != STEREO_ANAGLYPH) + if (g_Config.stereo_mode != StereoMode::Anaglyph) { // Setting the anaglyph mode also requires a specific // post-processing shader to be activated. - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(STEREO_ANAGLYPH)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(StereoMode::Anaglyph)); Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("dubois")); } else { - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(STEREO_OFF)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(StereoMode::Off)); Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("")); } } if (IsHotkey(HK_TOGGLE_STEREO_3DVISION)) { - if (g_Config.iStereoMode != STEREO_3DVISION) + if (g_Config.stereo_mode != StereoMode::Nvidia3DVision) { if (g_Config.sPostProcessingShader == "dubois") { Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("")); } - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(STEREO_3DVISION)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(StereoMode::Nvidia3DVision)); } else { - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(STEREO_OFF)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast(StereoMode::Off)); } } -- cgit v1.2.3