diff options
author | bunnei <bunneidev@gmail.com> | 2018-07-27 04:03:33 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-07-28 04:33:37 +0200 |
commit | 2a742229ee3abc2c3b3a9c41cc8a164850d6a0b1 (patch) | |
tree | 45660816cf49328635dbf4b14f8c811387f10350 /src | |
parent | audio_core: Add initial code for keeping track of audout state. (diff) | |
download | yuzu-2a742229ee3abc2c3b3a9c41cc8a164850d6a0b1.tar yuzu-2a742229ee3abc2c3b3a9c41cc8a164850d6a0b1.tar.gz yuzu-2a742229ee3abc2c3b3a9c41cc8a164850d6a0b1.tar.bz2 yuzu-2a742229ee3abc2c3b3a9c41cc8a164850d6a0b1.tar.lz yuzu-2a742229ee3abc2c3b3a9c41cc8a164850d6a0b1.tar.xz yuzu-2a742229ee3abc2c3b3a9c41cc8a164850d6a0b1.tar.zst yuzu-2a742229ee3abc2c3b3a9c41cc8a164850d6a0b1.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/core.cpp | 2 | ||||
-rw-r--r-- | src/core/core.h | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index b7f4b4532..186fa46df 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -177,6 +177,7 @@ System::ResultStatus System::Init(EmuWindow* emu_window, u32 system_mode) { } gpu_core = std::make_unique<Tegra::GPU>(); + audio_core = std::make_unique<AudioCore::AudioOut>(); telemetry_session = std::make_unique<Core::TelemetrySession>(); service_manager = std::make_shared<Service::SM::ServiceManager>(); @@ -228,6 +229,7 @@ void System::Shutdown() { service_manager.reset(); telemetry_session.reset(); gpu_core.reset(); + audio_core.reset(); // Close all CPU/threading state cpu_barrier->NotifyEnd(); diff --git a/src/core/core.h b/src/core/core.h index c123fe401..6f4df775f 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -8,6 +8,7 @@ #include <memory> #include <string> #include <thread> +#include "audio_core/audio_out.h" #include "common/common_types.h" #include "core/arm/exclusive_monitor.h" #include "core/core_cpu.h" @@ -131,6 +132,11 @@ public: return *gpu_core; } + /// Gets the AudioCore interface + AudioCore::AudioOut& AudioCore() { + return *audio_core; + } + /// Gets the scheduler for the CPU core that is currently running Kernel::Scheduler& CurrentScheduler() { return *CurrentCpuCore().Scheduler(); @@ -195,6 +201,7 @@ private: /// AppLoader used to load the current executing application std::unique_ptr<Loader::AppLoader> app_loader; std::unique_ptr<Tegra::GPU> gpu_core; + std::unique_ptr<AudioCore::AudioOut> audio_core; std::shared_ptr<Tegra::DebugContext> debug_context; Kernel::SharedPtr<Kernel::Process> current_process; std::shared_ptr<ExclusiveMonitor> cpu_exclusive_monitor; |