ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4860 from lioncash/lock 

FifoPlayerDlg: Use std::lock_guard instead of manual mutex locking/unlocking
This commit is contained in:
Matthew Parlane 2017-02-08 18:59:28 +13:00 committed by GitHub
parent f838d16b0c 399757a771
commit e2706b4381
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/DolphinWX/FifoPlayerDlg.cpp
View File

@ -47,9 +47,10 @@ FifoPlayerDlg::FifoPlayerDlg(wxWindow* const parent)
{
CreateGUIControls();
sMutex.lock();
m_EvtHandler = GetEventHandler();
sMutex.unlock();
{
std::lock_guard<std::recursive_mutex> lock{sMutex};
m_EvtHandler = GetEventHandler();
}
FifoPlayer::GetInstance().SetFileLoadedCallback(FileLoaded);
FifoPlayer::GetInstance().SetFrameWrittenCallback(FrameWritten);
@ -59,9 +60,8 @@ FifoPlayerDlg::~FifoPlayerDlg()
{
FifoPlayer::GetInstance().SetFrameWrittenCallback(nullptr);
sMutex.lock();
std::lock_guard<std::recursive_mutex> lock{sMutex};
m_EvtHandler = nullptr;
sMutex.unlock();
}
void FifoPlayerDlg::CreateGUIControls()
@ -953,39 +953,33 @@ bool FifoPlayerDlg::GetSaveButtonEnabled() const
void FifoPlayerDlg::RecordingFinished()
{
sMutex.lock();
std::lock_guard<std::recursive_mutex> lock{sMutex};
if (m_EvtHandler)
{
wxCommandEvent event(RECORDING_FINISHED_EVENT);
m_EvtHandler->AddPendingEvent(event);
}
sMutex.unlock();
}
void FifoPlayerDlg::FileLoaded()
{
sMutex.lock();
std::lock_guard<std::recursive_mutex> lock{sMutex};
if (m_EvtHandler)
{
wxPaintEvent event;
m_EvtHandler->AddPendingEvent(event);
}
sMutex.unlock();
}
void FifoPlayerDlg::FrameWritten()
{
sMutex.lock();
std::lock_guard<std::recursive_mutex> lock{sMutex};
if (m_EvtHandler)
{
wxCommandEvent event(FRAME_WRITTEN_EVENT);
m_EvtHandler->AddPendingEvent(event);
}
sMutex.unlock();
}