summaryrefslogtreecommitdiff
path: root/src/core/core.h
diff options
context:
space:
mode:
authorGravatar bunnei2018-07-30 20:29:17 -0700
committerGravatar GitHub2018-07-30 20:29:17 -0700
commitbf9c62bc76a2296c1a81cfc1b83aaf4028578901 (patch)
treedad8906c597af3f579d4f72f4c9f493503c40665 /src/core/core.h
parentPort #3758 from Citra (#852): Add missing std::string import in text_formatter (diff)
parentaudio_core: Implement Sink and SinkStream interfaces with cubeb. (diff)
downloadyuzu-bf9c62bc76a2296c1a81cfc1b83aaf4028578901.tar.gz
yuzu-bf9c62bc76a2296c1a81cfc1b83aaf4028578901.tar.xz
yuzu-bf9c62bc76a2296c1a81cfc1b83aaf4028578901.zip
Merge pull request #855 from bunnei/cubeb
Audio output backend based on cubeb
Diffstat (limited to 'src/core/core.h')
-rw-r--r--src/core/core.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/core/core.h b/src/core/core.h
index 6f4df775f..c123fe401 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -8,7 +8,6 @@
8#include <memory> 8#include <memory>
9#include <string> 9#include <string>
10#include <thread> 10#include <thread>
11#include "audio_core/audio_out.h"
12#include "common/common_types.h" 11#include "common/common_types.h"
13#include "core/arm/exclusive_monitor.h" 12#include "core/arm/exclusive_monitor.h"
14#include "core/core_cpu.h" 13#include "core/core_cpu.h"
@@ -132,11 +131,6 @@ public:
132 return *gpu_core; 131 return *gpu_core;
133 } 132 }
134 133
135 /// Gets the AudioCore interface
136 AudioCore::AudioOut& AudioCore() {
137 return *audio_core;
138 }
139
140 /// Gets the scheduler for the CPU core that is currently running 134 /// Gets the scheduler for the CPU core that is currently running
141 Kernel::Scheduler& CurrentScheduler() { 135 Kernel::Scheduler& CurrentScheduler() {
142 return *CurrentCpuCore().Scheduler(); 136 return *CurrentCpuCore().Scheduler();
@@ -201,7 +195,6 @@ private:
201 /// AppLoader used to load the current executing application 195 /// AppLoader used to load the current executing application
202 std::unique_ptr<Loader::AppLoader> app_loader; 196 std::unique_ptr<Loader::AppLoader> app_loader;
203 std::unique_ptr<Tegra::GPU> gpu_core; 197 std::unique_ptr<Tegra::GPU> gpu_core;
204 std::unique_ptr<AudioCore::AudioOut> audio_core;
205 std::shared_ptr<Tegra::DebugContext> debug_context; 198 std::shared_ptr<Tegra::DebugContext> debug_context;
206 Kernel::SharedPtr<Kernel::Process> current_process; 199 Kernel::SharedPtr<Kernel::Process> current_process;
207 std::shared_ptr<ExclusiveMonitor> cpu_exclusive_monitor; 200 std::shared_ptr<ExclusiveMonitor> cpu_exclusive_monitor;