diff options
| author | 2018-03-26 22:24:31 -0400 | |
|---|---|---|
| committer | 2018-03-26 23:02:35 -0400 | |
| commit | 12b05c719eac7ed289a1d3d2acfb94704326fac1 (patch) | |
| tree | bc325f8b272ee36157eb8f06c1fae89bb6d8151d /src | |
| parent | Merge pull request #279 from bunnei/tegra-progress-3 (diff) | |
| download | yuzu-12b05c719eac7ed289a1d3d2acfb94704326fac1.tar.gz yuzu-12b05c719eac7ed289a1d3d2acfb94704326fac1.tar.xz yuzu-12b05c719eac7ed289a1d3d2acfb94704326fac1.zip | |
config: Add setting for whether the system is docked or not.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 8 | ||||
| -rw-r--r-- | src/core/settings.h | 3 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 8 | ||||
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu_cmd/default_ini.h | 4 |
5 files changed, 24 insertions, 2 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index d9f003ed4..07522e730 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include "core/hle/service/apm/apm.h" | 12 | #include "core/hle/service/apm/apm.h" |
| 13 | #include "core/hle/service/filesystem/filesystem.h" | 13 | #include "core/hle/service/filesystem/filesystem.h" |
| 14 | #include "core/hle/service/nvflinger/nvflinger.h" | 14 | #include "core/hle/service/nvflinger/nvflinger.h" |
| 15 | #include "core/settings.h" | ||
| 15 | 16 | ||
| 16 | namespace Service { | 17 | namespace Service { |
| 17 | namespace AM { | 18 | namespace AM { |
| @@ -241,17 +242,20 @@ void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) { | |||
| 241 | } | 242 | } |
| 242 | 243 | ||
| 243 | void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) { | 244 | void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) { |
| 245 | const bool is_docked{Settings::values.is_docked}; | ||
| 244 | IPC::ResponseBuilder rb{ctx, 3}; | 246 | IPC::ResponseBuilder rb{ctx, 3}; |
| 245 | rb.Push(RESULT_SUCCESS); | 247 | rb.Push(RESULT_SUCCESS); |
| 246 | rb.Push(static_cast<u8>(OperationMode::Handheld)); | 248 | rb.Push(static_cast<u8>(is_docked ? OperationMode::Docked : OperationMode::Handheld)); |
| 247 | 249 | ||
| 248 | LOG_WARNING(Service_AM, "(STUBBED) called"); | 250 | LOG_WARNING(Service_AM, "(STUBBED) called"); |
| 249 | } | 251 | } |
| 250 | 252 | ||
| 251 | void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) { | 253 | void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) { |
| 254 | const bool is_docked{Settings::values.is_docked}; | ||
| 252 | IPC::ResponseBuilder rb{ctx, 3}; | 255 | IPC::ResponseBuilder rb{ctx, 3}; |
| 253 | rb.Push(RESULT_SUCCESS); | 256 | rb.Push(RESULT_SUCCESS); |
| 254 | rb.Push(static_cast<u32>(APM::PerformanceMode::Handheld)); | 257 | rb.Push(static_cast<u32>(is_docked ? APM::PerformanceMode::Docked |
| 258 | : APM::PerformanceMode::Handheld)); | ||
| 255 | 259 | ||
| 256 | LOG_WARNING(Service_AM, "(STUBBED) called"); | 260 | LOG_WARNING(Service_AM, "(STUBBED) called"); |
| 257 | } | 261 | } |
diff --git a/src/core/settings.h b/src/core/settings.h index 6f8cd0f03..002d25dbd 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -111,6 +111,9 @@ enum class CpuCore { | |||
| 111 | }; | 111 | }; |
| 112 | 112 | ||
| 113 | struct Values { | 113 | struct Values { |
| 114 | // System | ||
| 115 | bool is_docked; | ||
| 116 | |||
| 114 | // Controls | 117 | // Controls |
| 115 | std::array<std::string, NativeButton::NumButtons> buttons; | 118 | std::array<std::string, NativeButton::NumButtons> buttons; |
| 116 | std::array<std::string, NativeAnalog::NumAnalogs> analogs; | 119 | std::array<std::string, NativeAnalog::NumAnalogs> analogs; |
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 71dc58e5d..5842bebee 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -94,6 +94,10 @@ void Config::ReadValues() { | |||
| 94 | Settings::values.use_virtual_sd = qt_config->value("use_virtual_sd", true).toBool(); | 94 | Settings::values.use_virtual_sd = qt_config->value("use_virtual_sd", true).toBool(); |
| 95 | qt_config->endGroup(); | 95 | qt_config->endGroup(); |
| 96 | 96 | ||
| 97 | qt_config->beginGroup("System"); | ||
| 98 | Settings::values.is_docked = qt_config->value("is_docked", true).toBool(); | ||
| 99 | qt_config->endGroup(); | ||
| 100 | |||
| 97 | qt_config->beginGroup("Miscellaneous"); | 101 | qt_config->beginGroup("Miscellaneous"); |
| 98 | Settings::values.log_filter = qt_config->value("log_filter", "*:Info").toString().toStdString(); | 102 | Settings::values.log_filter = qt_config->value("log_filter", "*:Info").toString().toStdString(); |
| 99 | qt_config->endGroup(); | 103 | qt_config->endGroup(); |
| @@ -188,6 +192,10 @@ void Config::SaveValues() { | |||
| 188 | qt_config->setValue("use_virtual_sd", Settings::values.use_virtual_sd); | 192 | qt_config->setValue("use_virtual_sd", Settings::values.use_virtual_sd); |
| 189 | qt_config->endGroup(); | 193 | qt_config->endGroup(); |
| 190 | 194 | ||
| 195 | qt_config->beginGroup("System"); | ||
| 196 | qt_config->setValue("is_docked", Settings::values.is_docked); | ||
| 197 | qt_config->endGroup(); | ||
| 198 | |||
| 191 | qt_config->beginGroup("Miscellaneous"); | 199 | qt_config->beginGroup("Miscellaneous"); |
| 192 | qt_config->setValue("log_filter", QString::fromStdString(Settings::values.log_filter)); | 200 | qt_config->setValue("log_filter", QString::fromStdString(Settings::values.log_filter)); |
| 193 | qt_config->endGroup(); | 201 | qt_config->endGroup(); |
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 342ad3850..38f76d425 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -107,6 +107,9 @@ void Config::ReadValues() { | |||
| 107 | Settings::values.use_virtual_sd = | 107 | Settings::values.use_virtual_sd = |
| 108 | sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true); | 108 | sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true); |
| 109 | 109 | ||
| 110 | // System | ||
| 111 | Settings::values.is_docked = sdl2_config->GetBoolean("System", "is_docked", true); | ||
| 112 | |||
| 110 | // Miscellaneous | 113 | // Miscellaneous |
| 111 | Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); | 114 | Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); |
| 112 | 115 | ||
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index fe104fb81..50802104c 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h | |||
| @@ -154,6 +154,10 @@ output_device = | |||
| 154 | use_virtual_sd = | 154 | use_virtual_sd = |
| 155 | 155 | ||
| 156 | [System] | 156 | [System] |
| 157 | # Whether the system is docked | ||
| 158 | # 1 (default): Yes, 0: No | ||
| 159 | is_docked = | ||
| 160 | |||
| 157 | # The system region that Citra will use during emulation | 161 | # The system region that Citra will use during emulation |
| 158 | # -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan | 162 | # -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan |
| 159 | region_value = | 163 | region_value = |