summaryrefslogtreecommitdiff
path: root/src/citra/config.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra/config.cpp')
-rw-r--r--src/citra/config.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 1d0faf193..fac1c9a0e 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -82,6 +82,7 @@ void Config::ReadValues() {
82 Settings::values.sink_id = sdl2_config->Get("Audio", "output_engine", "auto"); 82 Settings::values.sink_id = sdl2_config->Get("Audio", "output_engine", "auto");
83 Settings::values.enable_audio_stretching = 83 Settings::values.enable_audio_stretching =
84 sdl2_config->GetBoolean("Audio", "enable_audio_stretching", true); 84 sdl2_config->GetBoolean("Audio", "enable_audio_stretching", true);
85 Settings::values.audio_device_id = sdl2_config->Get("Audio", "output_device", "auto");
85 86
86 // Data Storage 87 // Data Storage
87 Settings::values.use_virtual_sd = 88 Settings::values.use_virtual_sd =
@@ -92,6 +93,21 @@ void Config::ReadValues() {
92 Settings::values.region_value = 93 Settings::values.region_value =
93 sdl2_config->GetInteger("System", "region_value", Settings::REGION_VALUE_AUTO_SELECT); 94 sdl2_config->GetInteger("System", "region_value", Settings::REGION_VALUE_AUTO_SELECT);
94 95
96 // Camera
97 using namespace Service::CAM;
98 Settings::values.camera_name[OuterRightCamera] =
99 sdl2_config->Get("Camera", "camera_outer_right_name", "blank");
100 Settings::values.camera_config[OuterRightCamera] =
101 sdl2_config->Get("Camera", "camera_outer_right_config", "");
102 Settings::values.camera_name[InnerCamera] =
103 sdl2_config->Get("Camera", "camera_inner_name", "blank");
104 Settings::values.camera_config[InnerCamera] =
105 sdl2_config->Get("Camera", "camera_inner_config", "");
106 Settings::values.camera_name[OuterLeftCamera] =
107 sdl2_config->Get("Camera", "camera_outer_left_name", "blank");
108 Settings::values.camera_config[OuterLeftCamera] =
109 sdl2_config->Get("Camera", "camera_outer_left_config", "");
110
95 // Miscellaneous 111 // Miscellaneous
96 Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Info"); 112 Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Info");
97 113