piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11641 from JosJuice/android-remove-old-config

Browse Source 
Android: Remove support for the old config system
This commit is contained in:
Mai
2023-03-14 15:48:04 -04:00
committed by GitHub
parent e83b6e19ab 08334015f9
commit 4281606838
69 changed files with 388 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/Config/Config.cpp
View File

@ -159,7 +159,8 @@ static const std::map<System, std::string> system_to_name = {
{System::SYSCONF, "SYSCONF"},
{System::DualShockUDPClient, "DualShockUDPClient"},
{System::FreeLook, "FreeLook"},
{System::Session, "Session"}};
{System::Session, "Session"},
{System::GameSettingsOnly, "GameSettingsOnly"}};
const std::string& GetSystemName(System system)
{

1
Source/Core/Common/Config/Enums.h
View File

@ -33,6 +33,7 @@ enum class System
DualShockUDPClient,
FreeLook,
Session,
GameSettingsOnly,
};
constexpr std::array<LayerType, 7> SEARCH_ORDER{{

3
Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp
View File

@ -159,6 +159,9 @@ public:
if (location.system == Config::System::Session)
continue;
if (location.system == Config::System::GameSettingsOnly)
continue;
auto ini = inis.find(location.system);
if (ini == inis.end())
{

1
Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
View File

@ -104,6 +104,7 @@ static const INIToSectionMap& GetINIToSectionMap()
{"Video_Stereoscopy", {Config::System::GFX, "Stereoscopy"}},
{"Video_Hacks", {Config::System::GFX, "Hacks"}},
{"Video", {Config::System::GFX, "GameSpecific"}},
{"Controls", {Config::System::GameSettingsOnly, "Controls"}},
};
return ini_to_section;
}

3
Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
View File

@ -18,7 +18,8 @@ bool IsSettingSaveable(const Config::Location& config_location)
{
for (Config::System system :
{Config::System::SYSCONF, Config::System::GFX, Config::System::DualShockUDPClient,
Config::System::Logger, Config::System::FreeLook, Config::System::Main})
Config::System::Logger, Config::System::FreeLook, Config::System::Main,
Config::System::GameSettingsOnly})
{
if (config_location.system == system)
return true;