summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Source/Core/Core/FifoPlayer/FifoRecorder.cpp20
1 files changed, 17 insertions, 3 deletions
diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
index 8f08c6f158..3473b4deb4 100644
--- a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
@@ -18,9 +18,7 @@
static FifoRecorder instance;
static std::recursive_mutex sMutex;
-FifoRecorder::FifoRecorder() : m_Ram(Memory::RAM_SIZE), m_ExRam(Memory::EXRAM_SIZE)
-{
-}
+FifoRecorder::FifoRecorder() = default;
FifoRecorder::~FifoRecorder()
{
@@ -36,6 +34,22 @@ void FifoRecorder::StartRecording(s32 numFrames, CallbackFunc finishedCb)
FifoAnalyzer::Init();
m_File = new FifoDataFile;
+
+ // TODO: This, ideally, would be deallocated when done recording.
+ // However, care needs to be taken since global state
+ // and multithreading don't play well nicely together.
+ // The video thread may call into functions that utilize these
+ // despite 'end recording' being requested via StopRecording().
+ // (e.g. OpcodeDecoder calling UseMemory())
+ //
+ // Basically:
+ // - Singletons suck
+ // - Global variables suck
+ // - Multithreading with the above two sucks
+ //
+ m_Ram.resize(Memory::RAM_SIZE);
+ m_ExRam.resize(Memory::EXRAM_SIZE);
+
std::fill(m_Ram.begin(), m_Ram.end(), 0);
std::fill(m_ExRam.begin(), m_ExRam.end(), 0);