diff options
| author | 2023-08-29 22:20:59 -0400 | |
|---|---|---|
| committer | 2023-08-29 22:20:59 -0400 | |
| commit | 44bce118534980a1da12ace2502408cf3d8641e2 (patch) | |
| tree | 006675bed0e4a67709abba293ad5142609a41395 /src/common/settings_common.h | |
| parent | Merge pull request #11413 from t895/intents (diff) | |
| parent | android: Don't reload settings when stopping settings activity (diff) | |
| download | yuzu-44bce118534980a1da12ace2502408cf3d8641e2.tar.gz yuzu-44bce118534980a1da12ace2502408cf3d8641e2.tar.xz yuzu-44bce118534980a1da12ace2502408cf3d8641e2.zip | |
Merge pull request #11380 from t895/settings-integration
android: Settings rework
Diffstat (limited to 'src/common/settings_common.h')
| -rw-r--r-- | src/common/settings_common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/settings_common.h b/src/common/settings_common.h index 3082e0ce1..5b170dfd5 100644 --- a/src/common/settings_common.h +++ b/src/common/settings_common.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | namespace Settings { | 12 | namespace Settings { |
| 13 | 13 | ||
| 14 | enum class Category : u32 { | 14 | enum class Category : u32 { |
| 15 | Android, | ||
| 15 | Audio, | 16 | Audio, |
| 16 | Core, | 17 | Core, |
| 17 | Cpu, | 18 | Cpu, |
| @@ -68,6 +69,7 @@ public: | |||
| 68 | explicit Linkage(u32 initial_count = 0); | 69 | explicit Linkage(u32 initial_count = 0); |
| 69 | ~Linkage(); | 70 | ~Linkage(); |
| 70 | std::map<Category, std::vector<BasicSetting*>> by_category{}; | 71 | std::map<Category, std::vector<BasicSetting*>> by_category{}; |
| 72 | std::map<std::string, Settings::BasicSetting*> by_key{}; | ||
| 71 | std::vector<std::function<void()>> restore_functions{}; | 73 | std::vector<std::function<void()>> restore_functions{}; |
| 72 | u32 count; | 74 | u32 count; |
| 73 | }; | 75 | }; |