diff options
| author | 2017-01-29 22:16:39 -0800 | |
|---|---|---|
| committer | 2017-01-29 22:16:39 -0800 | |
| commit | 1410aa182435fcca3756bbb58af90a479e9f248d (patch) | |
| tree | 53685c7e5422428869ef45d4f8de0a350dcfdd7f /src/citra/config.cpp | |
| parent | Merge pull request #2429 from wwylele/auto-language-fix (diff) | |
| parent | CAM: implement basic camera functions with a blank camera (diff) | |
| download | yuzu-1410aa182435fcca3756bbb58af90a479e9f248d.tar.gz yuzu-1410aa182435fcca3756bbb58af90a479e9f248d.tar.xz yuzu-1410aa182435fcca3756bbb58af90a479e9f248d.zip | |
Merge pull request #2368 from wwylele/camera-2
CAM: build the service framework with a dummy implementation
Diffstat (limited to 'src/citra/config.cpp')
| -rw-r--r-- | src/citra/config.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 827c90e55..fac1c9a0e 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp | |||
| @@ -93,6 +93,21 @@ void Config::ReadValues() { | |||
| 93 | Settings::values.region_value = | 93 | Settings::values.region_value = |
| 94 | sdl2_config->GetInteger("System", "region_value", Settings::REGION_VALUE_AUTO_SELECT); | 94 | sdl2_config->GetInteger("System", "region_value", Settings::REGION_VALUE_AUTO_SELECT); |
| 95 | 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 | |||
| 96 | // Miscellaneous | 111 | // Miscellaneous |
| 97 | Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Info"); | 112 | Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Info"); |
| 98 | 113 | ||