Merge pull request #1315 from RisingFog/movie-menu-input-display

Moved Input Display to Movie Menu
This commit is contained in:
skidau committed 2014-10-20 14:34:02 +11:00
commit 81efd0e87f
11 files changed
+16 -7

No files matched your search

+2
View File
@@ -328,6 +328,7 @@ void SConfig::SaveMovieSettings(IniFile& ini)
movie->Set("PauseMovie", m_PauseMovie);
movie->Set("Author", m_strMovieAuthor);
movie->Set("DumpFrames", m_DumpFrames);
movie->Set("ShowInputDisplay", m_ShowInputDisplay);
}
void SConfig::SaveDSPSettings(IniFile& ini)
@@ -555,6 +556,7 @@ void SConfig::LoadMovieSettings(IniFile& ini)
movie->Get("PauseMovie", &m_PauseMovie, false);
movie->Get("Author", &m_strMovieAuthor, "");
movie->Get("DumpFrames", &m_DumpFrames, false);
movie->Get("ShowInputDisplay", &m_ShowInputDisplay, false);
}
void SConfig::LoadDSPSettings(IniFile& ini)
+1
View File
@@ -90,6 +90,7 @@ struct SConfig : NonCopyable
std::string m_strMovieAuthor;
unsigned int m_FrameSkip;
bool m_DumpFrames;
bool m_ShowInputDisplay;
// DSP settings
bool m_DSPEnableJIT;