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 #1262 from RisingFog/movie-dump-fix 

Changed Dump Frames References
This commit is contained in:
skidau 2014-10-13 13:26:01 +11:00
parent 18c81dbc33 cd0c784d5a
commit 26fc3c168a
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,8 @@
#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "VideoBackends/Software/SWVideoConfig.h"
#include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoConfig.h"
@ -727,7 +729,8 @@ void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event))
void CFrame::OnToggleDumpFrames(wxCommandEvent& WXUNUSED(event)) void CFrame::OnToggleDumpFrames(wxCommandEvent& WXUNUSED(event))
{ {
g_ActiveConfig.bDumpFrames = !g_ActiveConfig.bDumpFrames; g_Config.bDumpFrames = !g_Config.bDumpFrames;
g_SWVideoConfig.bDumpFrames = !g_SWVideoConfig.bDumpFrames;
} }
void CFrame::OnToggleDumpAudio(wxCommandEvent& WXUNUSED(event)) void CFrame::OnToggleDumpAudio(wxCommandEvent& WXUNUSED(event))

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

@ -54,7 +54,6 @@ void SWVideoConfig::Load(const char* ini_file)
IniFile::Section* utility = iniFile.GetOrCreateSection("Utility"); IniFile::Section* utility = iniFile.GetOrCreateSection("Utility");
utility->Get("DumpTexture", &bDumpTextures, false); utility->Get("DumpTexture", &bDumpTextures, false);
utility->Get("DumpObjects", &bDumpObjects, false); utility->Get("DumpObjects", &bDumpObjects, false);
utility->Get("DumpFrames", &bDumpFrames, false);
utility->Get("DumpTevStages", &bDumpTevStages, false); utility->Get("DumpTevStages", &bDumpTevStages, false);
utility->Get("DumpTevTexFetches", &bDumpTevTextureFetches, false); utility->Get("DumpTevTexFetches", &bDumpTevTextureFetches, false);
@ -84,7 +83,6 @@ void SWVideoConfig::Save(const char* ini_file)
IniFile::Section* utility = iniFile.GetOrCreateSection("Utility"); IniFile::Section* utility = iniFile.GetOrCreateSection("Utility");
utility->Set("DumpTexture", bDumpTextures); utility->Set("DumpTexture", bDumpTextures);
utility->Set("DumpObjects", bDumpObjects); utility->Set("DumpObjects", bDumpObjects);
utility->Set("DumpFrames", bDumpFrames);
utility->Set("DumpTevStages", bDumpTevStages); utility->Set("DumpTevStages", bDumpTevStages);
utility->Set("DumpTevTexFetches", bDumpTevTextureFetches); utility->Set("DumpTevTexFetches", bDumpTevTextureFetches);

2
Source/Core/VideoCommon/VideoConfig.cpp
View File

@ -65,7 +65,6 @@ void VideoConfig::Load(const std::string& ini_file)
settings->Get("DumpTextures", &bDumpTextures, 0); settings->Get("DumpTextures", &bDumpTextures, 0);
settings->Get("HiresTextures", &bHiresTextures, 0); settings->Get("HiresTextures", &bHiresTextures, 0);
settings->Get("DumpEFBTarget", &bDumpEFBTarget, 0); settings->Get("DumpEFBTarget", &bDumpEFBTarget, 0);
settings->Get("DumpFrames", &bDumpFrames, 0);
settings->Get("FreeLook", &bFreeLook, 0); settings->Get("FreeLook", &bFreeLook, 0);
settings->Get("UseFFV1", &bUseFFV1, 0); settings->Get("UseFFV1", &bUseFFV1, 0);
settings->Get("AnaglyphStereo", &bAnaglyphStereo, false); settings->Get("AnaglyphStereo", &bAnaglyphStereo, false);
@ -234,7 +233,6 @@ void VideoConfig::Save(const std::string& ini_file)
settings->Set("DumpTextures", bDumpTextures); settings->Set("DumpTextures", bDumpTextures);
settings->Set("HiresTextures", bHiresTextures); settings->Set("HiresTextures", bHiresTextures);
settings->Set("DumpEFBTarget", bDumpEFBTarget); settings->Set("DumpEFBTarget", bDumpEFBTarget);
settings->Set("DumpFrames", bDumpFrames);
settings->Set("FreeLook", bFreeLook); settings->Set("FreeLook", bFreeLook);
settings->Set("UseFFV1", bUseFFV1); settings->Set("UseFFV1", bUseFFV1);
settings->Set("AnaglyphStereo", bAnaglyphStereo); settings->Set("AnaglyphStereo", bAnaglyphStereo);