From eda27ee39799080ee652b4de332ff532c08a00a2 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 21 Mar 2017 15:29:00 -0400
Subject: [PATCH] FifoPlayer: In-class initialize member variables where
 applicable

---
 Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 12 ++++--------
 Source/Core/Core/FifoPlayer/FifoPlayer.h   | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
index 036e2581c2..b6e7ab60ef 100644
--- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
@@ -31,6 +31,10 @@
 
 bool IsPlayingBackFifologWithBrokenEFBCopies = false;
 
+FifoPlayer::FifoPlayer() : m_Loop{SConfig::GetInstance().bLoopFifoReplay}
+{
+}
+
 FifoPlayer::~FifoPlayer()
 {
 }
@@ -205,14 +209,6 @@ FifoPlayer& FifoPlayer::GetInstance()
   return instance;
 }
 
-FifoPlayer::FifoPlayer()
-    : m_CurrentFrame(0), m_FrameRangeStart(0), m_FrameRangeEnd(0), m_ObjectRangeStart(0),
-      m_ObjectRangeEnd(10000), m_EarlyMemoryUpdates(false), m_FileLoadedCb(nullptr),
-      m_FrameWrittenCb(nullptr), m_File(nullptr)
-{
-  m_Loop = SConfig::GetInstance().bLoopFifoReplay;
-}
-
 void FifoPlayer::WriteFrame(const FifoFrameInfo& frame, const AnalyzedFrameInfo& info)
 {
   // Core timing information
diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.h b/Source/Core/Core/FifoPlayer/FifoPlayer.h
index cdbb72669d..1751a2f997 100644
--- a/Source/Core/Core/FifoPlayer/FifoPlayer.h
+++ b/Source/Core/Core/FifoPlayer/FifoPlayer.h
@@ -130,21 +130,21 @@ private:
 
   bool m_Loop;
 
-  u32 m_CurrentFrame;
-  u32 m_FrameRangeStart;
-  u32 m_FrameRangeEnd;
+  u32 m_CurrentFrame = 0;
+  u32 m_FrameRangeStart = 0;
+  u32 m_FrameRangeEnd = 0;
 
-  u32 m_ObjectRangeStart;
-  u32 m_ObjectRangeEnd;
+  u32 m_ObjectRangeStart = 0;
+  u32 m_ObjectRangeEnd = 10000;
 
-  bool m_EarlyMemoryUpdates;
+  bool m_EarlyMemoryUpdates = false;
 
-  u64 m_CyclesPerFrame;
-  u32 m_ElapsedCycles;
-  u32 m_FrameFifoSize;
+  u64 m_CyclesPerFrame = 0;
+  u32 m_ElapsedCycles = 0;
+  u32 m_FrameFifoSize = 0;
 
-  CallbackFunc m_FileLoadedCb;
-  CallbackFunc m_FrameWrittenCb;
+  CallbackFunc m_FileLoadedCb = nullptr;
+  CallbackFunc m_FrameWrittenCb = nullptr;
 
   std::unique_ptr<FifoDataFile> m_File;