diff options
| author | bunnei <bunneidev@gmail.com> | 2016-04-30 03:49:11 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-04-30 03:49:11 -0400 |
| commit | c1f0044a4b10bdff45464e5957f7950a6059d0c9 (patch) | |
| tree | d9b4673f92da936ce763148f70b82bc7401dd968 /src/citra | |
| parent | 594bd182b447059bd21d6a79169c19d7cac226f3 (diff) | |
| parent | 4e971f44a27c2e4abc25ddf0720d287a688e0a4d (diff) | |
Merge pull request #1729 from MerryMage/null-sink
Audio Config: Implement null sink and implement sink configuration
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/config.cpp | 3 | ||||
| -rw-r--r-- | src/citra/default_ini.h | 5 |
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 |