piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-01 02:29:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add an IsMovieActive function.

Browse Source 
Makes things a bit simpler, since this is a common check.
This commit is contained in:
Rachel Bryk
2014-09-06 23:44:25 -04:00
parent 46c18aa909
commit 5a163ec5e6
10 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/ConfigMain.cpp
View File

@ -757,7 +757,7 @@ void CConfigMain::CreateGUIControls()
{
sbGamecubeDevSettings->Add(GCSIDeviceText[i], 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 0);
sbGamecubeDevSettings->Add(GCSIDevice[i], 1, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 0);
if (NetPlay::IsNetPlayRunning() || Movie::IsRecordingInput() || Movie::IsPlayingInput())
if (NetPlay::IsNetPlayRunning() || Movie::IsMovieActive())
{
GCSIDevice[i]->Disable();
}

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

@ -1084,7 +1084,7 @@ void CFrame::DoStop()
// TODO: Show the author/description dialog here
if (Movie::IsRecordingInput())
DoRecordingSave();
if (Movie::IsPlayingInput() || Movie::IsRecordingInput())
if (Movie::IsMovieActive())
Movie::EndPlayInput(false);
NetPlay::StopGame();
@ -1631,7 +1631,7 @@ void CFrame::UpdateGUI()
GetMenuBar()->FindItem(IDM_RESET)->Enable(Running || Paused);
GetMenuBar()->FindItem(IDM_RECORD)->Enable(!Movie::IsRecordingInput());
GetMenuBar()->FindItem(IDM_PLAYRECORD)->Enable(!Initialized);
GetMenuBar()->FindItem(IDM_RECORDEXPORT)->Enable(Movie::IsPlayingInput() || Movie::IsRecordingInput());
GetMenuBar()->FindItem(IDM_RECORDEXPORT)->Enable(Movie::IsMovieActive());
GetMenuBar()->FindItem(IDM_FRAMESTEP)->Enable(Running || Paused);
GetMenuBar()->FindItem(IDM_SCREENSHOT)->Enable(Running || Paused);
GetMenuBar()->FindItem(IDM_TOGGLE_FULLSCREEN)->Enable(Running || Paused);