piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1014 from RachelBryk/active-movie

Browse Source 
Add an IsMovieActive function.
This commit is contained in:
skidau
2014-09-07 14:05:59 +10:00
parent 741c0e2d50 5a163ec5e6
commit a21ad12f1e
10 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/Movie.cpp
View File

@ -113,7 +113,7 @@ static bool IsMovieHeader(u8 magic[4])
std::string GetInputDisplay()
{
if (!IsPlayingInput() && !IsRecordingInput())
if (!IsMovieActive())
{
g_numPads = 0;
for (int i = 0; i < 4; i++)
@ -198,7 +198,7 @@ void Init()
for (auto& disp : g_InputDisplay)
disp.clear();
if (!IsPlayingInput() && !IsRecordingInput())
if (!IsMovieActive())
{
g_bRecordingFromSaveState = false;
g_rerecords = 0;
@ -273,7 +273,7 @@ void SetReadOnly(bool bEnabled)
void FrameSkipping()
{
// Frameskipping will desync movie playback
if (!IsPlayingInput() && !IsRecordingInput())
if (!IsMovieActive())
{
std::lock_guard<std::mutex> lk(cs_frameSkip);
@ -310,6 +310,11 @@ bool IsPlayingInput()
return (g_playMode == MODE_PLAYING);
}
bool IsMovieActive()
{
return g_playMode != MODE_NONE;
}
bool IsReadOnly()
{
return g_bReadOnly;