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 #1670 from lioncash/array 

FifoRecorder: Use std::vector for m_Ram and m_ExRam
This commit is contained in:
skidau 2014-12-11 14:26:09 +11:00
parent ef34761a51 faf962d528
commit fe67230663
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/FifoPlayer/FifoRecorder.cpp
View File

@ -23,8 +23,8 @@ FifoRecorder::FifoRecorder() :
m_SkipNextData(true), m_SkipNextData(true),
m_SkipFutureData(true), m_SkipFutureData(true),
m_FrameEnded(false), m_FrameEnded(false),
m_Ram(nullptr), m_Ram(Memory::RAM_SIZE),
m_ExRam(nullptr) m_ExRam(Memory::EXRAM_SIZE)
{ {
} }
@ -38,15 +38,10 @@ void FifoRecorder::StartRecording(s32 numFrames, CallbackFunc finishedCb)
sMutex.lock(); sMutex.lock();
delete m_File; delete m_File;
delete []m_Ram;
delete []m_ExRam;
m_File = new FifoDataFile; m_File = new FifoDataFile;
std::fill(m_Ram.begin(), m_Ram.end(), 0);
m_Ram = new u8[Memory::RAM_SIZE]; std::fill(m_ExRam.begin(), m_ExRam.end(), 0);
m_ExRam = new u8[Memory::EXRAM_SIZE];
memset(m_Ram, 0, Memory::RAM_SIZE);
memset(m_ExRam, 0, Memory::EXRAM_SIZE);
m_File->SetIsWii(SConfig::GetInstance().m_LocalCoreStartupParameter.bWii); m_File->SetIsWii(SConfig::GetInstance().m_LocalCoreStartupParameter.bWii);

6
Source/Core/Core/FifoPlayer/FifoRecorder.h
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <vector>
#include "Core/FifoPlayer/FifoDataFile.h" #include "Core/FifoPlayer/FifoDataFile.h"
#include "Core/FifoPlayer/FifoRecordAnalyzer.h" #include "Core/FifoPlayer/FifoRecordAnalyzer.h"
@ -58,7 +60,7 @@ private:
bool m_FrameEnded; bool m_FrameEnded;
FifoFrameInfo m_CurrentFrame; FifoFrameInfo m_CurrentFrame;
std::vector<u8> m_FifoData; std::vector<u8> m_FifoData;
u8 *m_Ram; std::vector<u8> m_Ram;
u8 *m_ExRam; std::vector<u8> m_ExRam;
FifoRecordAnalyzer m_RecordAnalyzer; FifoRecordAnalyzer m_RecordAnalyzer;
}; };