From 4e5e7cff0a1de0bdef693edee02a7e1ee0f48322 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 21 Mar 2017 15:34:04 -0400 Subject: [PATCH] FifoRecorder: In-class initialize member variables where applicable --- Source/Core/Core/FifoPlayer/FifoRecorder.cpp | 6 +----- Source/Core/Core/FifoPlayer/FifoRecorder.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp index 5a55b9f459..378ad29290 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp @@ -17,11 +17,7 @@ static FifoRecorder instance; static std::recursive_mutex sMutex; -FifoRecorder::FifoRecorder() - : m_IsRecording(false), m_WasRecording(false), m_RequestedRecordingEnd(false), - m_RecordFramesRemaining(0), m_FinishedCb(nullptr), m_File(nullptr), m_SkipNextData(true), - m_SkipFutureData(true), m_FrameEnded(false), m_Ram(Memory::RAM_SIZE), - m_ExRam(Memory::EXRAM_SIZE) +FifoRecorder::FifoRecorder() : m_Ram(Memory::RAM_SIZE), m_ExRam(Memory::EXRAM_SIZE) { } diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.h b/Source/Core/Core/FifoPlayer/FifoRecorder.h index 63ce93eaf7..ba0ab38fa6 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.h +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.h @@ -47,20 +47,20 @@ private: // Accessed from both GUI and video threads // True if video thread should send data - volatile bool m_IsRecording; + volatile bool m_IsRecording = false; // True if m_IsRecording was true during last frame - volatile bool m_WasRecording; - volatile bool m_RequestedRecordingEnd; - volatile s32 m_RecordFramesRemaining; - volatile CallbackFunc m_FinishedCb; + volatile bool m_WasRecording = false; + volatile bool m_RequestedRecordingEnd = false; + volatile s32 m_RecordFramesRemaining = 0; + volatile CallbackFunc m_FinishedCb = nullptr; - FifoDataFile* volatile m_File; + FifoDataFile* volatile m_File = nullptr; // Accessed only from video thread - bool m_SkipNextData; - bool m_SkipFutureData; - bool m_FrameEnded; + bool m_SkipNextData = true; + bool m_SkipFutureData = true; + bool m_FrameEnded = false; FifoFrameInfo m_CurrentFrame; std::vector m_FifoData; std::vector m_Ram;