diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-01-29 22:16:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-29 22:16:39 -0800 |
| commit | 1410aa182435fcca3756bbb58af90a479e9f248d (patch) | |
| tree | 53685c7e5422428869ef45d4f8de0a350dcfdd7f /src/citra | |
| parent | a925473995af1832f6773faef9ca07a7957692a1 (diff) | |
| parent | cf3a272332b03640730d1434e9802e166ca931da (diff) | |
Merge pull request #2368 from wwylele/camera-2
CAM: build the service framework with a dummy implementation
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/config.cpp | 15 | ||||
| -rw-r--r-- | src/citra/default_ini.h | 16 |
2 files changed, 31 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() { Settings::values.region_value = sdl2_config->GetInteger("System", "region_value", Settings::REGION_VALUE_AUTO_SELECT); + // Camera + using namespace Service::CAM; + Settings::values.camera_name[OuterRightCamera] = + sdl2_config->Get("Camera", "camera_outer_right_name", "blank"); + Settings::values.camera_config[OuterRightCamera] = + sdl2_config->Get("Camera", "camera_outer_right_config", ""); + Settings::values.camera_name[InnerCamera] = + sdl2_config->Get("Camera", "camera_inner_name", "blank"); + Settings::values.camera_config[InnerCamera] = + sdl2_config->Get("Camera", "camera_inner_config", ""); + Settings::values.camera_name[OuterLeftCamera] = + sdl2_config->Get("Camera", "camera_outer_left_name", "blank"); + Settings::values.camera_config[OuterLeftCamera] = + sdl2_config->Get("Camera", "camera_outer_left_config", ""); + // Miscellaneous Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Info"); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index d728fb9e8..435ba6f00 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -109,6 +109,22 @@ is_new_3ds = # -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan region_value = +[Camera] +# Which camera engine to use for the right outer camera +# blank (default): a dummy camera that always returns black image +camera_outer_right_name = + +# A config string for the right outer camera. Its meaning is defined by the camera engine +camera_outer_right_config = + +# ... for the left outer camera +camera_outer_left_name = +camera_outer_left_config = + +# ... for the inner camera +camera_inner_name = +camera_inner_config = + [Miscellaneous] # A filter which removes logs below a certain logging level. # Examples: *:Debug Kernel.SVC:Trace Service.*:Critical |