Add option for author name for movies. Also, minor cleanup for previous options i've added.
This commit is contained in:
parent
8fe5aa4ee8
commit
14aa7150d9
|
@ -131,8 +131,7 @@ void SConfig::SaveSettings()
|
||||||
|
|
||||||
// General
|
// General
|
||||||
ini.Set("General", "LastFilename", m_LastFilename);
|
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
|
// ISO folders
|
||||||
// clear removed folders
|
// clear removed folders
|
||||||
|
@ -248,6 +247,10 @@ void SConfig::SaveSettings()
|
||||||
// GFX Backend
|
// GFX Backend
|
||||||
ini.Set("Core", "GFXBackend", m_LocalCoreStartupParameter.m_strVideoBackend);
|
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));
|
ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
|
||||||
m_SYSCONF->Save();
|
m_SYSCONF->Save();
|
||||||
}
|
}
|
||||||
|
@ -262,8 +265,7 @@ void SConfig::LoadSettings()
|
||||||
// General
|
// General
|
||||||
{
|
{
|
||||||
ini.Get("General", "LastFilename", &m_LastFilename);
|
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();
|
m_ISOFolder.clear();
|
||||||
int numGCMPaths;
|
int numGCMPaths;
|
||||||
|
@ -388,6 +390,10 @@ void SConfig::LoadSettings()
|
||||||
|
|
||||||
// GFX Backend
|
// GFX Backend
|
||||||
ini.Get("Core", "GFXBackend", &m_LocalCoreStartupParameter.m_strVideoBackend, "");
|
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();
|
m_SYSCONF = new SysConf();
|
||||||
|
|
|
@ -75,8 +75,9 @@ struct SConfig : NonCopyable
|
||||||
bool m_ListKorea;
|
bool m_ListKorea;
|
||||||
bool m_ListTaiwan;
|
bool m_ListTaiwan;
|
||||||
bool m_ListUnknown;
|
bool m_ListUnknown;
|
||||||
bool m_pauseMovie;
|
bool m_PauseMovie;
|
||||||
bool m_showLag;
|
bool m_ShowLag;
|
||||||
|
std::string m_strMovieAuthor;
|
||||||
|
|
||||||
SysConf* m_SYSCONF;
|
SysConf* m_SYSCONF;
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,7 @@ std::string GetInputDisplay()
|
||||||
|
|
||||||
void FrameUpdate()
|
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);
|
Core::SetState(Core::CORE_PAUSE);
|
||||||
}
|
}
|
||||||
|
@ -400,7 +400,7 @@ bool BeginRecordingInput(int controllers)
|
||||||
}
|
}
|
||||||
g_playMode = MODE_RECORDING;
|
g_playMode = MODE_RECORDING;
|
||||||
GetSettings();
|
GetSettings();
|
||||||
|
author = SConfig::GetInstance().m_strMovieAuthor;
|
||||||
delete [] tmpInput;
|
delete [] tmpInput;
|
||||||
tmpInput = new u8[MAX_DTM_LENGTH];
|
tmpInput = new u8[MAX_DTM_LENGTH];
|
||||||
g_currentByte = g_totalBytes = 0;
|
g_currentByte = g_totalBytes = 0;
|
||||||
|
|
|
@ -143,9 +143,9 @@ void CFrame::CreateMenu()
|
||||||
emulationMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK);
|
emulationMenu->Append(IDM_RECORDREADONLY, GetMenuLabel(HK_READ_ONLY_MODE), wxEmptyString, wxITEM_CHECK);
|
||||||
emulationMenu->Append(IDM_TASINPUT, _("TAS Input"));
|
emulationMenu->Append(IDM_TASINPUT, _("TAS Input"));
|
||||||
emulationMenu->AppendCheckItem(IDM_TOGGLE_PAUSEMOVIE, _("Pause at end of movie"));
|
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->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->Check(IDM_RECORDREADONLY, true);
|
||||||
emulationMenu->AppendSeparator();
|
emulationMenu->AppendSeparator();
|
||||||
|
|
||||||
|
@ -708,13 +708,13 @@ void CFrame::OnTASInput(wxCommandEvent& event)
|
||||||
|
|
||||||
void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (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();
|
SConfig::GetInstance().SaveSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CFrame::OnShowLag(wxCommandEvent& WXUNUSED (event))
|
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();
|
SConfig::GetInstance().SaveSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1095,7 +1095,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
|
||||||
D3D::font.DrawTextScaled(0, 0, 20, 0.0f, 0xFF00FFFF, fps);
|
D3D::font.DrawTextScaled(0, 0, 20, 0.0f, 0xFF00FFFF, fps);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SConfig::GetInstance().m_showLag)
|
if (SConfig::GetInstance().m_ShowLag)
|
||||||
{
|
{
|
||||||
char lag[10];
|
char lag[10];
|
||||||
StringCchPrintfA(lag, 1000, "Lag: %d\n", Movie::g_currentLagCount);
|
StringCchPrintfA(lag, 1000, "Lag: %d\n", Movie::g_currentLagCount);
|
||||||
|
|
|
@ -1092,7 +1092,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
|
||||||
D3D::font.DrawTextScaled(0, 0, 20, 20, 0.0f, 0xFF00FFFF, fps);
|
D3D::font.DrawTextScaled(0, 0, 20, 20, 0.0f, 0xFF00FFFF, fps);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SConfig::GetInstance().m_showLag)
|
if (SConfig::GetInstance().m_ShowLag)
|
||||||
{
|
{
|
||||||
char lag[10];
|
char lag[10];
|
||||||
StringCchPrintfA(lag, 1000, "Lag: %d\n", Movie::g_currentLagCount);
|
StringCchPrintfA(lag, 1000, "Lag: %d\n", Movie::g_currentLagCount);
|
||||||
|
|
|
@ -532,7 +532,7 @@ void Renderer::DrawDebugInfo()
|
||||||
if (g_ActiveConfig.bShowFPS)
|
if (g_ActiveConfig.bShowFPS)
|
||||||
p+=sprintf(p, "FPS: %d\n", s_fps);
|
p+=sprintf(p, "FPS: %d\n", s_fps);
|
||||||
|
|
||||||
if (SConfig::GetInstance().m_showLag)
|
if (SConfig::GetInstance().m_ShowLag)
|
||||||
p+=sprintf(p, "Lag: %d\n", Movie::g_currentLagCount);
|
p+=sprintf(p, "Lag: %d\n", Movie::g_currentLagCount);
|
||||||
|
|
||||||
if (g_ActiveConfig.bShowInputDisplay)
|
if (g_ActiveConfig.bShowInputDisplay)
|
||||||
|
|
Loading…
Reference in New Issue