diff options
| author | bunnei <bunneidev@gmail.com> | 2016-02-25 19:21:50 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-02-25 19:21:50 -0500 |
| commit | af7282b5ea8ed3ebfb47f35f6ac8212cfcb4c4fd (patch) | |
| tree | 1ae5c0281f70ff811ea2370610745b3957060fa5 /src/core/system.cpp | |
| parent | b63a4192a7f44e3ca59bbfe0a28fc9e04e9e1ab6 (diff) | |
| parent | 8b00954ec79fad71691ad2d4c82d5c1c60e21b0c (diff) | |
Merge pull request #1386 from MerryMage/audio-core-skeleton
Audio Core: Skeleton
Diffstat (limited to 'src/core/system.cpp')
| -rw-r--r-- | src/core/system.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index 7e9c56538b..b62ebf69e3 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -2,9 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/audio_core.h" + #include "core/core.h" #include "core/core_timing.h" #include "core/system.h" +#include "core/gdbstub/gdbstub.h" #include "core/hw/hw.h" #include "core/hle/hle.h" #include "core/hle/kernel/kernel.h" @@ -12,8 +15,6 @@ #include "video_core/video_core.h" -#include "core/gdbstub/gdbstub.h" - namespace System { void Init(EmuWindow* emu_window) { @@ -24,11 +25,13 @@ void Init(EmuWindow* emu_window) { Kernel::Init(); HLE::Init(); VideoCore::Init(emu_window); + AudioCore::Init(); GDBStub::Init(); } void Shutdown() { GDBStub::Shutdown(); + AudioCore::Shutdown(); VideoCore::Shutdown(); HLE::Shutdown(); Kernel::Shutdown(); |