summaryrefslogtreecommitdiffstats
path: root/src/citra
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/citra
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/citra')
-rw-r--r--src/citra/config.cpp3
-rw-r--r--src/citra/default_ini.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 9e2ecd307..0d17c80bf 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -71,6 +71,9 @@ void Config::ReadValues() {
Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 1.0);
Settings::values.bg_blue = (float)sdl2_config->GetReal("Renderer", "bg_blue", 1.0);
+ // Audio
+ Settings::values.sink_id = sdl2_config->Get("Audio", "output_engine", "auto");
+
// Data Storage
Settings::values.use_virtual_sd = sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index 1f1aa716b..0e6171736 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -56,6 +56,11 @@ bg_red =
bg_blue =
bg_green =
+[Audio]
+# Which audio output engine to use.
+# auto (default): Auto-select, null: No audio output
+output_engine =
+
[Data Storage]
# Whether to create a virtual SD card.
# 1 (default): Yes, 0: No