Add option for author name for movies. Also, minor cleanup for previous options i've added.

4 files changed, 19 insertions, 12 deletions

diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index df0ce1aa02..433be735c2 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -131,8 +131,7 @@ void SConfig::SaveSettings()
 
 	// General
 	ini.Set("General", "LastFilename",	m_LastFilename);
-	ini.Set("General", "PauseMovie", m_pauseMovie);
-	ini.Set("General", "ShowLag", m_showLag);
+	ini.Set("General", "ShowLag", m_ShowLag);
 
 	// ISO folders
 	// clear removed folders
@@ -248,6 +247,10 @@ void SConfig::SaveSettings()
 	// GFX Backend
 	ini.Set("Core", "GFXBackend",	m_LocalCoreStartupParameter.m_strVideoBackend);
 
+	// Movie
+	ini.Set("Movie", "PauseMovie", m_PauseMovie);
+	ini.Set("Movie", "Author", m_strMovieAuthor);
+
 	ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
 	m_SYSCONF->Save();
 }
@@ -262,8 +265,7 @@ void SConfig::LoadSettings()
 	// General
 	{
 		ini.Get("General", "LastFilename",	&m_LastFilename);
-		ini.Get("General", "PauseMovie", &m_pauseMovie, false);
-		ini.Get("General", "ShowLag", &m_showLag, false);
+		ini.Get("General", "ShowLag", &m_ShowLag, false);
 
 		m_ISOFolder.clear();
 		int numGCMPaths;
@@ -388,6 +390,10 @@ void SConfig::LoadSettings()
 
 		// GFX Backend
 		ini.Get("Core", "GFXBackend",  &m_LocalCoreStartupParameter.m_strVideoBackend, "");
+
+		// Movie
+		ini.Get("General", "PauseMovie", &m_PauseMovie, false);
+		ini.Get("Movie", "Author", &m_strMovieAuthor, "");
 	}
 
 	m_SYSCONF = new SysConf();
diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h
index 1235e23eac..f8733296b4 100644
--- a/Source/Core/Core/Src/ConfigManager.h
+++ b/Source/Core/Core/Src/ConfigManager.h
@@ -75,8 +75,9 @@ struct SConfig : NonCopyable
 	bool m_ListKorea;
 	bool m_ListTaiwan;
 	bool m_ListUnknown;
-	bool m_pauseMovie;
-	bool m_showLag;
+	bool m_PauseMovie;
+	bool m_ShowLag;
+	std::string m_strMovieAuthor;
 
 	SysConf* m_SYSCONF;
 
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index 189201a36a..a03f1a568e 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -92,7 +92,7 @@ std::string GetInputDisplay()
 
 void FrameUpdate()
 {
-	if (IsPlayingInput() && g_currentInputCount == g_totalInputCount -1  && SConfig::GetInstance().m_pauseMovie)
+	if (IsPlayingInput() && g_currentInputCount == g_totalInputCount -1  && SConfig::GetInstance().m_PauseMovie)
 	{
 		Core::SetState(Core::CORE_PAUSE);
 	}
@@ -400,7 +400,7 @@ bool BeginRecordingInput(int controllers)
 	}
 	g_playMode = MODE_RECORDING;
 	GetSettings();
-
+	author = SConfig::GetInstance().m_strMovieAuthor;
 	delete [] tmpInput;
 	tmpInput = new u8[MAX_DTM_LENGTH];
 	g_currentByte = g_totalBytes = 0;
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index e4a7ed8986..2d2b308799 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -143,9 +143,9 @@ void CFrame::CreateMenu()
 	emulationMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK);
 	emulationMenu->Append(IDM_TASINPUT, _("TAS Input"));
 	emulationMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie"));

-	emulationMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_pauseMovie);
+	emulationMenu->Check(IDM_TOGGLE_PAUSEMOVIE, SConfig::GetInstance().m_PauseMovie);
 	emulationMenu->AppendCheckItem(IDM_SHOWLAG, _("Show lag counter"));

-	emulationMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_showLag);
+	emulationMenu->Check(IDM_SHOWLAG, SConfig::GetInstance().m_ShowLag);
 	emulationMenu->Check(IDM_RECORDREADONLY, true);
 	emulationMenu->AppendSeparator();
 
@@ -708,13 +708,13 @@ void CFrame::OnTASInput(wxCommandEvent& event)
 
 void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event))
 {
-	SConfig::GetInstance().m_pauseMovie = !SConfig::GetInstance().m_pauseMovie;
+	SConfig::GetInstance().m_PauseMovie = !SConfig::GetInstance().m_PauseMovie;
 	SConfig::GetInstance().SaveSettings();
 }
 
 void CFrame::OnShowLag(wxCommandEvent& WXUNUSED (event))
 {
-	SConfig::GetInstance().m_showLag = !SConfig::GetInstance().m_showLag;
+	SConfig::GetInstance().m_ShowLag = !SConfig::GetInstance().m_ShowLag;
 	SConfig::GetInstance().SaveSettings();
 }