ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1272 from RisingFog/sconfig-dump-frames 

Move bDumpFrames to SConfig (and it's references)
This commit is contained in:
skidau 2014-10-15 13:42:37 +11:00
parent 9f5ea81ffe 8d424b114a
commit 8ef21bc5e2
11 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/ConfigManager.cpp
View File

@ -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)
@ -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)

1
Source/Core/Core/ConfigManager.h
View File

@ -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;

6
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -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"));
@ -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))

1
Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
View File

@ -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"));

6
Source/Core/VideoBackends/D3D/Render.cpp
View File

@ -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);
@ -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);
@ -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;

12
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -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;

4
Source/Core/VideoBackends/Software/DebugUtil.cpp
View File

@ -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"
@ -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);

1
Source/Core/VideoBackends/Software/SWVideoConfig.cpp
View File

@ -21,7 +21,6 @@ SWVideoConfig::SWVideoConfig()
bDumpTextures = false;
bDumpObjects = false;
bDumpFrames = false;
bZComploc = true;
bZFreeze = true;

1
Source/Core/VideoBackends/Software/SWVideoConfig.h
View File

@ -31,7 +31,6 @@ struct SWVideoConfig : NonCopyable
bool bDumpTextures;
bool bDumpObjects;
bool bDumpFrames;
// Debug only
bool bDumpTevStages;

3
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -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"
@ -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())

1
Source/Core/VideoCommon/VideoConfig.h
View File

@ -94,7 +94,6 @@ struct VideoConfig final
bool bDumpTextures;
bool bHiresTextures;
bool bDumpEFBTarget;
bool bDumpFrames;
bool bUseFFV1;
bool bFreeLook;
bool bAnaglyphStereo;