summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-12-07 17:38:57 -0500
committerLioncash <mathew1800@gmail.com>2014-12-07 18:13:53 -0500
commitfaf962d528046ba53bc6d7a4e1da98673c370cbf (patch)
tree4ab1a205e87bff13f991f7026fe3d15abb7f1e19 /Source
parent3a149c3aab63be54c5932563b2957e9e3016a8aa (diff)
FifoRecorder: Use std::vector for m_Ram and m_ExRam
No need to delete/recreate the arrays every time a new recording happens. Just zero it out.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/FifoPlayer/FifoRecorder.cpp13
-rw-r--r--Source/Core/Core/FifoPlayer/FifoRecorder.h6
2 files changed, 8 insertions, 11 deletions
diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
index 3e52916dd2..247f3d3afd 100644
--- a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
@@ -23,8 +23,8 @@ FifoRecorder::FifoRecorder() :
m_SkipNextData(true),
m_SkipFutureData(true),
m_FrameEnded(false),
- m_Ram(nullptr),
- m_ExRam(nullptr)
+ m_Ram(Memory::RAM_SIZE),
+ m_ExRam(Memory::EXRAM_SIZE)
{
}
@@ -38,15 +38,10 @@ void FifoRecorder::StartRecording(s32 numFrames, CallbackFunc finishedCb)
sMutex.lock();
delete m_File;
- delete []m_Ram;
- delete []m_ExRam;
m_File = new FifoDataFile;
-
- m_Ram = new u8[Memory::RAM_SIZE];
- m_ExRam = new u8[Memory::EXRAM_SIZE];
- memset(m_Ram, 0, Memory::RAM_SIZE);
- memset(m_ExRam, 0, Memory::EXRAM_SIZE);
+ std::fill(m_Ram.begin(), m_Ram.end(), 0);
+ std::fill(m_ExRam.begin(), m_ExRam.end(), 0);
m_File->SetIsWii(SConfig::GetInstance().m_LocalCoreStartupParameter.bWii);
diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.h b/Source/Core/Core/FifoPlayer/FifoRecorder.h
index 2b7bc0dfb2..51c37843c7 100644
--- a/Source/Core/Core/FifoPlayer/FifoRecorder.h
+++ b/Source/Core/Core/FifoPlayer/FifoRecorder.h
@@ -4,6 +4,8 @@
#pragma once
+#include <vector>
+
#include "Core/FifoPlayer/FifoDataFile.h"
#include "Core/FifoPlayer/FifoRecordAnalyzer.h"
@@ -58,7 +60,7 @@ private:
bool m_FrameEnded;
FifoFrameInfo m_CurrentFrame;
std::vector<u8> m_FifoData;
- u8 *m_Ram;
- u8 *m_ExRam;
+ std::vector<u8> m_Ram;
+ std::vector<u8> m_ExRam;
FifoRecordAnalyzer m_RecordAnalyzer;
};