summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-04-30 09:49:11 +0200
committerbunnei <bunneidev@gmail.com>2016-04-30 09:49:11 +0200
commitc1f0044a4b10bdff45464e5957f7950a6059d0c9 (patch)
treed9b4673f92da936ce763148f70b82bc7401dd968 /src/core
parentMerge pull request #1650 from JamePeng/update-the-ndm-code (diff)
parentAudio: Add sink selection to configuration files (diff)
downloadyuzu-c1f0044a4b10bdff45464e5957f7950a6059d0c9.tar
yuzu-c1f0044a4b10bdff45464e5957f7950a6059d0c9.tar.gz
yuzu-c1f0044a4b10bdff45464e5957f7950a6059d0c9.tar.bz2
yuzu-c1f0044a4b10bdff45464e5957f7950a6059d0c9.tar.lz
yuzu-c1f0044a4b10bdff45464e5957f7950a6059d0c9.tar.xz
yuzu-c1f0044a4b10bdff45464e5957f7950a6059d0c9.tar.zst
yuzu-c1f0044a4b10bdff45464e5957f7950a6059d0c9.zip
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 @@
#include "settings.h"
+#include "audio_core/audio_core.h"
+
#include "core/gdbstub/gdbstub.h"
#include "video_core/video_core.h"
@@ -20,6 +22,9 @@ void Apply() {
VideoCore::g_hw_renderer_enabled = values.use_hw_renderer;
VideoCore::g_shader_jit_enabled = values.use_shader_jit;
VideoCore::g_scaled_resolution_enabled = values.use_scaled_resolution;
+
+ AudioCore::SelectSink(values.sink_id);
+
}
} // 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 {
std::string log_filter;
+ // Audio
+ std::string sink_id;
+
// Debugging
bool use_gdbstub;
u16 gdbstub_port;