Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2882 from danzel/movie-squash

Browse source 
Movie (Game Inputs) recording and playback
This commit is contained in:
James Rowe 2018-01-23 01:03:37 -07:00 • committed by GitHub
commit 44d07574b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 673 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/core.cpp
View file

@ -21,6 +21,7 @@
#include "core/hw/hw.h"
#include "core/loader/loader.h"
#include "core/memory_setup.h"
#include "core/movie.h"
#include "core/settings.h"
#include "network/network.h"
#include "video_core/video_core.h"
@ -167,6 +168,7 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) {
Service::Init();
AudioCore::Init();
GDBStub::Init();
Movie::GetInstance().Init();
if (!VideoCore::Init(emu_window)) {
return ResultStatus::ErrorVideoCore;
@ -192,6 +194,7 @@ void System::Shutdown() {
perf_results.frametime * 1000.0);
// Shutdown emulation session
Movie::GetInstance().Shutdown();
GDBStub::Shutdown();
AudioCore::Shutdown();
VideoCore::Shutdown();