diff options
| author | skidau <skidau@gmail.com> | 2014-10-15 13:42:37 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-15 13:42:37 +1100 |
| commit | 8ef21bc5e292e8060ba2bdd6e55ab6e70a5ec984 (patch) | |
| tree | 4c7553297675844d44e76d9f9cf0d6cdae6e2bb3 /Source/Core/VideoBackends/OGL/Render.cpp | |
| parent | 9f5ea81ffed409c6c0533cef08431e0311165f4b (diff) | |
| parent | 8d424b114ae98243744a118e44d38e0a40645682 (diff) | |
Merge pull request #1272 from RisingFog/sconfig-dump-frames
Move bDumpFrames to SConfig (and it's references)
Diffstat (limited to 'Source/Core/VideoBackends/OGL/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index e669490e60..0239c67582 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -1366,10 +1366,10 @@ void Renderer::SetBlendMode(bool forceUpdate) static void DumpFrame(const std::vector<u8>& data, int w, int h) { #if defined(HAVE_LIBAV) || defined(_WIN32) - if (g_ActiveConfig.bDumpFrames && !data.empty()) - { - AVIDump::AddFrame(&data[0], w, h); - } + if (SConfig::GetInstance().m_DumpFrames && !data.empty()) + { + AVIDump::AddFrame(&data[0], w, h); + } #endif } @@ -1516,7 +1516,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL) { #if defined _WIN32 || defined HAVE_LIBAV - if (g_ActiveConfig.bDumpFrames) + if (SConfig::GetInstance().m_DumpFrames) { std::lock_guard<std::mutex> lk(s_criticalScreenshot); if (frame_data.empty() || w != flipped_trc.GetWidth() || @@ -1577,7 +1577,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co bLastFrameDumped = false; } #else - if (g_ActiveConfig.bDumpFrames) + if (SConfig::GetInstance().m_DumpFrames) { std::lock_guard<std::mutex> lk(s_criticalScreenshot); std::string movie_file_name; |