Skip to content

Commit

Permalink
Merge pull request #1272 from RisingFog/sconfig-dump-frames
Browse files Browse the repository at this point in the history 
Move bDumpFrames to SConfig (and it's references)
  • Loading branch information
@skidau
skidau committed Oct 15, 2014
2 parents 9f5ea81 + 8d424b1 commit 8ef21bc
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 18 deletions.
2 changes: 2 additions & 0 deletions Source/Core/Core/ConfigManager.cpp
View file
Expand Up @@ -327,6 +327,7 @@ void SConfig::SaveMovieSettings(IniFile& ini)

movie->Set("PauseMovie", m_PauseMovie);
movie->Set("Author", m_strMovieAuthor);
movie->Set("DumpFrames", m_DumpFrames);
}

void SConfig::SaveDSPSettings(IniFile& ini)
Expand Down Expand Up @@ -553,6 +554,7 @@ void SConfig::LoadMovieSettings(IniFile& ini)

movie->Get("PauseMovie", &m_PauseMovie, false);
movie->Get("Author", &m_strMovieAuthor, "");
movie->Get("DumpFrames", &m_DumpFrames, false);
}

void SConfig::LoadDSPSettings(IniFile& ini)
Expand Down
1 change: 1 addition & 0 deletions Source/Core/Core/ConfigManager.h
View file
Expand Up @@ -89,6 +89,7 @@ struct SConfig : NonCopyable
bool m_ShowFrameCount;
std::string m_strMovieAuthor;
unsigned int m_FrameSkip;
bool m_DumpFrames;

// DSP settings
bool m_DSPEnableJIT;
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/DolphinWX/FrameTools.cpp
View file
Expand Up @@ -220,7 +220,7 @@ wxMenuBar* CFrame::CreateMenu()
movieMenu->Check(IDM_RECORDREADONLY, true);
movieMenu->AppendSeparator();
movieMenu->AppendCheckItem(IDM_TOGGLE_DUMPFRAMES, _("Dump frames"));
movieMenu->Check(IDM_TOGGLE_DUMPFRAMES, g_ActiveConfig.bDumpFrames);
movieMenu->Check(IDM_TOGGLE_DUMPFRAMES, SConfig::GetInstance().m_DumpFrames);
movieMenu->AppendCheckItem(IDM_TOGGLE_DUMPAUDIO, _("Dump audio"));
movieMenu->Check(IDM_TOGGLE_DUMPAUDIO, SConfig::GetInstance().m_DumpAudio);
menubar->Append(movieMenu, _("&Movie"));
Expand Down Expand Up @@ -729,8 +729,8 @@ void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event))

void CFrame::OnToggleDumpFrames(wxCommandEvent& WXUNUSED(event))
{
g_Config.bDumpFrames = !g_Config.bDumpFrames;
g_SWVideoConfig.bDumpFrames = !g_SWVideoConfig.bDumpFrames;
SConfig::GetInstance().m_DumpFrames = !SConfig::GetInstance().m_DumpFrames;
SConfig::GetInstance().SaveSettings();
}

void CFrame::OnToggleDumpAudio(wxCommandEvent& WXUNUSED(event))
Expand Down
1 change: 0 additions & 1 deletion Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
View file
Expand Up @@ -102,7 +102,6 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std

szr_utility->Add(new SettingCheckBox(page_general, _("Dump Textures"), "", vconfig.bDumpTextures));
szr_utility->Add(new SettingCheckBox(page_general, _("Dump Objects"), "", vconfig.bDumpObjects));
szr_utility->Add(new SettingCheckBox(page_general, _("Dump Frames"), "", vconfig.bDumpFrames));

// - debug only
wxStaticBoxSizer* const group_debug_only_utility = new wxStaticBoxSizer(wxHORIZONTAL, page_general, _("Debug Only"));
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/VideoBackends/D3D/Render.cpp
View file
Expand Up @@ -713,7 +713,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
{
if (g_bSkipCurrentFrame || (!XFBWrited && !g_ActiveConfig.RealXFBEnabled()) || !fbWidth || !fbHeight)
{
if (g_ActiveConfig.bDumpFrames && !frame_data.empty())
if (SConfig::GetInstance().m_DumpFrames && !frame_data.empty())
AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight);

Core::Callback_VideoCopiedToXFB(false);
Expand All @@ -724,7 +724,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, &xfbCount);
if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB)
{
if (g_ActiveConfig.bDumpFrames && !frame_data.empty())
if (SConfig::GetInstance().m_DumpFrames && !frame_data.empty())
AVIDump::AddFrame(&frame_data[0], fbWidth, fbHeight);

Core::Callback_VideoCopiedToXFB(false);
Expand Down Expand Up @@ -833,7 +833,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co

// Dump frames
static int w = 0, h = 0;
if (g_ActiveConfig.bDumpFrames)
if (SConfig::GetInstance().m_DumpFrames)
{
static int s_recordWidth;
static int s_recordHeight;
Expand Down
12 changes: 6 additions & 6 deletions Source/Core/VideoBackends/OGL/Render.cpp
View file
Expand Up @@ -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
}

Expand Down Expand Up @@ -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() ||
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion Source/Core/VideoBackends/Software/DebugUtil.cpp
View file
Expand Up @@ -6,6 +6,8 @@
#include "Common/FileUtil.h"
#include "Common/StringUtil.h"

#include "Core/ConfigManager.h"

#include "VideoBackends/Software/BPMemLoader.h"
#include "VideoBackends/Software/DebugUtil.h"
#include "VideoBackends/Software/EfbInterface.h"
Expand Down Expand Up @@ -253,7 +255,7 @@ void OnFrameEnd(u32 width, u32 height)
{
if (!g_bSkipCurrentFrame)
{
if (g_SWVideoConfig.bDumpFrames)
if (SConfig::GetInstance().m_DumpFrames)
{
DumpColorTexture(StringFromFormat("%sframe%i_color.png",
File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount), width, height);
Expand Down
1 change: 0 additions & 1 deletion Source/Core/VideoBackends/Software/SWVideoConfig.cpp
View file
Expand Up @@ -21,7 +21,6 @@ SWVideoConfig::SWVideoConfig()

bDumpTextures = false;
bDumpObjects = false;
bDumpFrames = false;

bZComploc = true;
bZFreeze = true;
Expand Down
1 change: 0 additions & 1 deletion Source/Core/VideoBackends/Software/SWVideoConfig.h
View file
Expand Up @@ -31,7 +31,6 @@ struct SWVideoConfig : NonCopyable

bool bDumpTextures;
bool bDumpObjects;
bool bDumpFrames;

// Debug only
bool bDumpTevStages;
Expand Down
3 changes: 2 additions & 1 deletion Source/Core/VideoCommon/RenderBase.cpp
View file
Expand Up @@ -19,6 +19,7 @@
#include "Common/StringUtil.h"
#include "Common/Timer.h"

#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/FifoPlayer/FifoRecorder.h"
Expand Down Expand Up @@ -97,7 +98,7 @@ Renderer::~Renderer()
efb_scale_numeratorX = efb_scale_numeratorY = efb_scale_denominatorX = efb_scale_denominatorY = 1;

#if defined _WIN32 || defined HAVE_LIBAV
if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && bAVIDumping)
if (SConfig::GetInstance().m_DumpFrames && bLastFrameDumped && bAVIDumping)
AVIDump::Stop();
#else
if (pFrameDump.IsOpen())
Expand Down
1 change: 0 additions & 1 deletion Source/Core/VideoCommon/VideoConfig.h
View file
Expand Up @@ -94,7 +94,6 @@ struct VideoConfig final
bool bDumpTextures;
bool bHiresTextures;
bool bDumpEFBTarget;
bool bDumpFrames;
bool bUseFFV1;
bool bFreeLook;
bool bAnaglyphStereo;
Expand Down

2 comments on commit 8ef21bc

@CarlKenner
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this a step backwards? Aren't we preventing people from turning on and off Dump Frames during gameplay? This sounds like a bad idea to me.

@RisingFog
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can still be turned on and off during gameplay, it's simply moving it from VideoConfig to ConfigManager

Please sign in to comment.