diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2017-02-13 14:10:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 14:10:23 -0800 |
| commit | f966354044dd74dbb06eb298bd943e5156c124ce (patch) | |
| tree | 192c0398d8bc2a9b61b3d0415748df85493036fc /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | f68955502a987b5cbdf6f56e2b002a03c05a3845 (diff) | |
| parent | 28c9f2a44dec0f65662e1ed4e05a1ed037b76b75 (diff) | |
Merge pull request #4898 from RisingFog/stop_recording_dtm
Add Stop Play/Recording Input Menu
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 94b91179c5..5c435da2f3 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -141,6 +141,7 @@ void CFrame::BindMenuBarEvents() // Movie menu Bind(wxEVT_MENU, &CFrame::OnRecord, this, IDM_RECORD); Bind(wxEVT_MENU, &CFrame::OnPlayRecording, this, IDM_PLAY_RECORD); + Bind(wxEVT_MENU, &CFrame::OnStopRecording, this, IDM_STOP_RECORD); Bind(wxEVT_MENU, &CFrame::OnRecordExport, this, IDM_RECORD_EXPORT); Bind(wxEVT_MENU, &CFrame::OnRecordReadOnly, this, IDM_RECORD_READ_ONLY); Bind(wxEVT_MENU, &CFrame::OnTASInput, this, IDM_TAS_INPUT); @@ -496,6 +497,30 @@ void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED(event)) BootGame(""); } +void CFrame::OnStopRecording(wxCommandEvent& WXUNUSED(event)) +{ + if (Movie::IsRecordingInput()) + { + const bool was_paused = Core::GetState() == Core::State::Paused; + DoRecordingSave(); + const bool is_paused = Core::GetState() == Core::State::Paused; + if (is_paused && !was_paused) + CPU::EnableStepping(false); + } + + if (!Movie::IsReadOnly()) + { + // let's make the read-only flag consistent at the start of a movie. + Movie::SetReadOnly(true); + GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check(); + } + + Movie::EndPlayInput(false); + + GetMenuBar()->FindItem(IDM_STOP_RECORD)->Enable(Movie::IsMovieActive()); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(!Movie::IsMovieActive()); +} + void CFrame::OnRecordExport(wxCommandEvent& WXUNUSED(event)) { DoRecordingSave(); @@ -1404,6 +1429,7 @@ void CFrame::UpdateGUI() GetMenuBar()->FindItem(IDM_RESET)->Enable(Running || Paused); GetMenuBar()->FindItem(IDM_RECORD)->Enable(!Movie::IsRecordingInput()); GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(!Initialized); + GetMenuBar()->FindItem(IDM_STOP_RECORD)->Enable(Movie::IsMovieActive()); GetMenuBar()->FindItem(IDM_RECORD_EXPORT)->Enable(Movie::IsMovieActive()); GetMenuBar()->FindItem(IDM_FRAMESTEP)->Enable(Running || Paused); GetMenuBar()->FindItem(IDM_SCREENSHOT)->Enable(Running || Paused); @@ -1488,6 +1514,9 @@ void CFrame::UpdateGUI() GetMenuBar()->FindItem(IDM_RECORD)->Enable(); GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(); } + + // Reset the stop playing/recording input menu item + GetMenuBar()->FindItem(IDM_STOP_RECORD)->SetItemLabel(_("Stop Playing/Recording Input")); } else if (Initialized) { @@ -1497,6 +1526,14 @@ void CFrame::UpdateGUI() // Reset game loading flag m_bGameLoading = false; + + // Rename the stop playing/recording menu item depending on current movie state + if (Movie::IsRecordingInput()) + GetMenuBar()->FindItem(IDM_STOP_RECORD)->SetItemLabel(_("Stop Recording Input")); + else if (Movie::IsPlayingInput()) + GetMenuBar()->FindItem(IDM_STOP_RECORD)->SetItemLabel(_("Stop Playing Input")); + else + GetMenuBar()->FindItem(IDM_STOP_RECORD)->SetItemLabel(_("Stop Playing/Recording Input")); } GetToolBar()->Refresh(false); |
