diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-11-19 15:08:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-19 15:08:16 +0100 |
| commit | 80bcc0d58d7d3b39d0e1b7973cbce34d4cf61f4e (patch) | |
| tree | 22d2ccf22820d55938bd47c7d0a7e81c2d722c7d /Source/Core/DolphinWX/Frame.cpp | |
| parent | a75546747ead9aad27ea7e62d340d18e446dcaf3 (diff) | |
| parent | 5337e58284aa9c727cdd66a1a79d968861a70839 (diff) | |
Merge pull request #6186 from lioncash/enum-class
VideoConfig: Make AspectMode and StereoMode enum classes
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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<int>(STEREO_SBS)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(StereoMode::SBS)); } else { - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(STEREO_OFF)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(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<int>(STEREO_TAB)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(StereoMode::TAB)); } else { - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(STEREO_OFF)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(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<int>(STEREO_ANAGLYPH)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(StereoMode::Anaglyph)); Config::SetCurrent(Config::GFX_ENHANCE_POST_SHADER, std::string("dubois")); } else { - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(STEREO_OFF)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(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<int>(STEREO_3DVISION)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(StereoMode::Nvidia3DVision)); } else { - Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(STEREO_OFF)); + Config::SetCurrent(Config::GFX_STEREO_MODE, static_cast<int>(StereoMode::Off)); } } |
