summaryrefslogtreecommitdiff
path: root/src/citra/config.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citra/config.cpp31
1 files changed, 17 insertions, 14 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 1a09f0e55..77679bd88 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -45,15 +45,13 @@ bool Config::LoadINI(const std::string& default_contents, bool retry) {
45 45
46static const std::array<int, Settings::NativeInput::NUM_INPUTS> defaults = { 46static const std::array<int, Settings::NativeInput::NUM_INPUTS> defaults = {
47 // directly mapped keys 47 // directly mapped keys
48 SDL_SCANCODE_A, SDL_SCANCODE_S, SDL_SCANCODE_Z, SDL_SCANCODE_X, 48 SDL_SCANCODE_A, SDL_SCANCODE_S, SDL_SCANCODE_Z, SDL_SCANCODE_X, SDL_SCANCODE_Q, SDL_SCANCODE_W,
49 SDL_SCANCODE_Q, SDL_SCANCODE_W, SDL_SCANCODE_1, SDL_SCANCODE_2, 49 SDL_SCANCODE_1, SDL_SCANCODE_2, SDL_SCANCODE_M, SDL_SCANCODE_N, SDL_SCANCODE_B, SDL_SCANCODE_T,
50 SDL_SCANCODE_M, SDL_SCANCODE_N, SDL_SCANCODE_B, 50 SDL_SCANCODE_G, SDL_SCANCODE_F, SDL_SCANCODE_H, SDL_SCANCODE_I, SDL_SCANCODE_K, SDL_SCANCODE_J,
51 SDL_SCANCODE_T, SDL_SCANCODE_G, SDL_SCANCODE_F, SDL_SCANCODE_H, 51 SDL_SCANCODE_L,
52 SDL_SCANCODE_I, SDL_SCANCODE_K, SDL_SCANCODE_J, SDL_SCANCODE_L,
53 52
54 // indirectly mapped keys 53 // indirectly mapped keys
55 SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT, 54 SDL_SCANCODE_UP, SDL_SCANCODE_DOWN, SDL_SCANCODE_LEFT, SDL_SCANCODE_RIGHT, SDL_SCANCODE_D,
56 SDL_SCANCODE_D,
57}; 55};
58 56
59void Config::ReadValues() { 57void Config::ReadValues() {
@@ -62,7 +60,8 @@ void Config::ReadValues() {
62 Settings::values.input_mappings[Settings::NativeInput::All[i]] = 60 Settings::values.input_mappings[Settings::NativeInput::All[i]] =
63 sdl2_config->GetInteger("Controls", Settings::NativeInput::Mapping[i], defaults[i]); 61 sdl2_config->GetInteger("Controls", Settings::NativeInput::Mapping[i], defaults[i]);
64 } 62 }
65 Settings::values.pad_circle_modifier_scale = (float)sdl2_config->GetReal("Controls", "pad_circle_modifier_scale", 0.5); 63 Settings::values.pad_circle_modifier_scale =
64 (float)sdl2_config->GetReal("Controls", "pad_circle_modifier_scale", 0.5);
66 65
67 // Core 66 // Core
68 Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true); 67 Settings::values.use_cpu_jit = sdl2_config->GetBoolean("Core", "use_cpu_jit", true);
@@ -71,19 +70,22 @@ void Config::ReadValues() {
71 // Renderer 70 // Renderer
72 Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true); 71 Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true);
73 Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true); 72 Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true);
74 Settings::values.use_scaled_resolution = sdl2_config->GetBoolean("Renderer", "use_scaled_resolution", false); 73 Settings::values.use_scaled_resolution =
74 sdl2_config->GetBoolean("Renderer", "use_scaled_resolution", false);
75 Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false); 75 Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false);
76 76
77 Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 1.0); 77 Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 1.0);
78 Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 1.0); 78 Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 1.0);
79 Settings::values.bg_blue = (float)sdl2_config->GetReal("Renderer", "bg_blue", 1.0); 79 Settings::values.bg_blue = (float)sdl2_config->GetReal("Renderer", "bg_blue", 1.0);
80 80
81 // Audio 81 // Audio
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 = sdl2_config->GetBoolean("Audio", "enable_audio_stretching", true); 83 Settings::values.enable_audio_stretching =
84 sdl2_config->GetBoolean("Audio", "enable_audio_stretching", true);
84 85
85 // Data Storage 86 // Data Storage
86 Settings::values.use_virtual_sd = sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true); 87 Settings::values.use_virtual_sd =
88 sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
87 89
88 // System 90 // System
89 Settings::values.is_new_3ds = sdl2_config->GetBoolean("System", "is_new_3ds", false); 91 Settings::values.is_new_3ds = sdl2_config->GetBoolean("System", "is_new_3ds", false);
@@ -94,7 +96,8 @@ void Config::ReadValues() {
94 96
95 // Debugging 97 // Debugging
96 Settings::values.use_gdbstub = sdl2_config->GetBoolean("Debugging", "use_gdbstub", false); 98 Settings::values.use_gdbstub = sdl2_config->GetBoolean("Debugging", "use_gdbstub", false);
97 Settings::values.gdbstub_port = static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689)); 99 Settings::values.gdbstub_port =
100 static_cast<u16>(sdl2_config->GetInteger("Debugging", "gdbstub_port", 24689));
98} 101}
99 102
100void Config::Reload() { 103void Config::Reload() {