diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-08-27 01:15:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-27 01:15:00 +0200 |
commit | 6c4abd23be375afda850661cdf164b65e52f8cb8 (patch) | |
tree | 4245dfb837da484556040bb02915d0e7b53569c8 /src/common | |
parent | Merge pull request #11359 from Kelebek1/check_suitable_backend (diff) | |
parent | main: Fix docked mode button, clang 14 error (diff) | |
download | yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.gz yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.bz2 yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.lz yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.xz yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.tar.zst yuzu-6c4abd23be375afda850661cdf164b65e52f8cb8.zip |
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/settings.cpp | 5 | ||||
-rw-r--r-- | src/common/settings.h | 10 | ||||
-rw-r--r-- | src/common/settings_common.h | 1 | ||||
-rw-r--r-- | src/common/settings_enums.h | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 16a58a750..524056841 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include <version> +#include "common/settings_enums.h" #if __cpp_lib_chrono >= 201907L #include <chrono> #include <exception> @@ -145,6 +146,10 @@ bool IsFastmemEnabled() { return true; } +bool IsDockedMode() { + return values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked; +} + float Volume() { if (values.audio_muted) { return 0.0f; diff --git a/src/common/settings.h b/src/common/settings.h index 4407c1e6d..b15213bd7 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -379,7 +379,13 @@ struct Values { Setting<s32> current_user{linkage, 0, "current_user", Category::System}; - SwitchableSetting<bool> use_docked_mode{linkage, true, "use_docked_mode", Category::System}; + SwitchableSetting<ConsoleMode> use_docked_mode{linkage, + ConsoleMode::Docked, + "use_docked_mode", + Category::System, + Specialization::Radio, + true, + true}; // Controls InputSetting<std::array<PlayerInput, 10>> players; @@ -519,6 +525,8 @@ bool IsGPULevelHigh(); bool IsFastmemEnabled(); +bool IsDockedMode(); + float Volume(); std::string GetTimeZoneString(TimeZone time_zone); diff --git a/src/common/settings_common.h b/src/common/settings_common.h index 2efb329b0..3082e0ce1 100644 --- a/src/common/settings_common.h +++ b/src/common/settings_common.h @@ -56,6 +56,7 @@ enum Specialization : u8 { Scalar = 5, // Values are continuous Countable = 6, // Can be stepped through Paired = 7, // Another setting is associated with this setting + Radio = 8, // Setting should be presented in a radio group Percentage = (1 << SpecializationAttributeOffset), // Should be represented as a percentage }; diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index e7cb59ea5..815cafe15 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -146,6 +146,8 @@ ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum); ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch); +ENUM(ConsoleMode, Handheld, Docked); + template <typename Type> inline std::string CanonicalizeEnum(Type id) { const auto group = EnumMetadata<Type>::Canonicalizations(); |