summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGravatar MerryMage2016-04-27 13:53:23 +0100
committerGravatar MerryMage2016-04-30 07:41:02 +0100
commit4e971f44a27c2e4abc25ddf0720d287a688e0a4d (patch)
treec88ce045e20e40dd022a56dbd4a5281024591e61 /src/core
parentAudioCore: List of sink types (diff)
downloadyuzu-4e971f44a27c2e4abc25ddf0720d287a688e0a4d.tar.gz
yuzu-4e971f44a27c2e4abc25ddf0720d287a688e0a4d.tar.xz
yuzu-4e971f44a27c2e4abc25ddf0720d287a688e0a4d.zip
Audio: Add sink selection to configuration files
Diffstat (limited to 'src/core')
-rw-r--r--src/core/settings.cpp5
-rw-r--r--src/core/settings.h3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index eaf5c8461..77261eafe 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -4,6 +4,8 @@
4 4
5#include "settings.h" 5#include "settings.h"
6 6
7#include "audio_core/audio_core.h"
8
7#include "core/gdbstub/gdbstub.h" 9#include "core/gdbstub/gdbstub.h"
8 10
9#include "video_core/video_core.h" 11#include "video_core/video_core.h"
@@ -20,6 +22,9 @@ void Apply() {
20 VideoCore::g_hw_renderer_enabled = values.use_hw_renderer; 22 VideoCore::g_hw_renderer_enabled = values.use_hw_renderer;
21 VideoCore::g_shader_jit_enabled = values.use_shader_jit; 23 VideoCore::g_shader_jit_enabled = values.use_shader_jit;
22 VideoCore::g_scaled_resolution_enabled = values.use_scaled_resolution; 24 VideoCore::g_scaled_resolution_enabled = values.use_scaled_resolution;
25
26 AudioCore::SelectSink(values.sink_id);
27
23} 28}
24 29
25} // namespace 30} // namespace
diff --git a/src/core/settings.h b/src/core/settings.h
index d620d8461..04c0a47f9 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -63,6 +63,9 @@ struct Values {
63 63
64 std::string log_filter; 64 std::string log_filter;
65 65
66 // Audio
67 std::string sink_id;
68
66 // Debugging 69 // Debugging
67 bool use_gdbstub; 70 bool use_gdbstub;
68 u16 gdbstub_port; 71 u16 gdbstub_port;