mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-09 23:39:45 -06:00
1bf6762709
Settings.SECTION_INI_ANDROID and Settings.SECTION_BINDINGS both have the value "Android", but we only want the former to be marked as being handled by the new config system. This change fixes a problem where controller settings were not being properly saved to Dolphin.ini.
87 lines
2.9 KiB
C++
87 lines
2.9 KiB
C++
// Copyright 2017 Dolphin Emulator Project
|
|
// Licensed under GPLv2+
|
|
// Refer to the license.txt file included.
|
|
|
|
#include "Core/ConfigLoaders/IsSettingSaveable.h"
|
|
|
|
#include <algorithm>
|
|
#include <vector>
|
|
|
|
#include "Common/Config/Config.h"
|
|
#include "Core/Config/GraphicsSettings.h"
|
|
#include "Core/Config/MainSettings.h"
|
|
#include "Core/Config/UISettings.h"
|
|
|
|
namespace ConfigLoaders
|
|
{
|
|
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})
|
|
{
|
|
if (config_location.system == system)
|
|
return true;
|
|
}
|
|
|
|
if (config_location.system == Config::System::Main)
|
|
{
|
|
for (const std::string& section :
|
|
{"NetPlay", "General", "Display", "Network", "Analytics", "AndroidOverlayButtons"})
|
|
{
|
|
if (config_location.section == section)
|
|
return true;
|
|
}
|
|
|
|
// Android controller mappings are not saveable, other Android settings are.
|
|
// TODO: Kill the current Android controller mappings system
|
|
if (config_location.section == "Android")
|
|
{
|
|
static constexpr std::array<const char*, 8> android_setting_saveable = {
|
|
"ControlScale", "ControlOpacity", "EmulationOrientation", "JoystickRelCenter",
|
|
"LastPlatformTab", "MotionControls", "PhoneRumble", "ShowInputOverlay"};
|
|
|
|
return std::any_of(
|
|
android_setting_saveable.cbegin(), android_setting_saveable.cend(),
|
|
[&config_location](const char* key) { return key == config_location.key; });
|
|
}
|
|
}
|
|
|
|
static constexpr std::array<const Config::Location*, 17> s_setting_saveable = {
|
|
// Main.Core
|
|
|
|
&Config::MAIN_DEFAULT_ISO.GetLocation(),
|
|
&Config::MAIN_MEMCARD_A_PATH.GetLocation(),
|
|
&Config::MAIN_MEMCARD_B_PATH.GetLocation(),
|
|
&Config::MAIN_AUTO_DISC_CHANGE.GetLocation(),
|
|
&Config::MAIN_ALLOW_SD_WRITES.GetLocation(),
|
|
&Config::MAIN_DPL2_DECODER.GetLocation(),
|
|
&Config::MAIN_DPL2_QUALITY.GetLocation(),
|
|
&Config::MAIN_RAM_OVERRIDE_ENABLE.GetLocation(),
|
|
&Config::MAIN_MEM1_SIZE.GetLocation(),
|
|
&Config::MAIN_MEM2_SIZE.GetLocation(),
|
|
&Config::MAIN_GFX_BACKEND.GetLocation(),
|
|
&Config::MAIN_ENABLE_SAVESTATES.GetLocation(),
|
|
&Config::MAIN_FALLBACK_REGION.GetLocation(),
|
|
|
|
// Main.Interface
|
|
|
|
&Config::MAIN_USE_PANIC_HANDLERS.GetLocation(),
|
|
&Config::MAIN_OSD_MESSAGES.GetLocation(),
|
|
|
|
// Main.Interface
|
|
|
|
&Config::MAIN_SKIP_NKIT_WARNING.GetLocation(),
|
|
|
|
// UI.General
|
|
|
|
&Config::MAIN_USE_DISCORD_PRESENCE.GetLocation(),
|
|
};
|
|
|
|
return std::any_of(s_setting_saveable.cbegin(), s_setting_saveable.cend(),
|
|
[&config_location](const Config::Location* location) {
|
|
return *location == config_location;
|
|
});
|
|
}
|
|
} // namespace ConfigLoaders
|