Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-17 22:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

System: Preparations for per-game controller settings

Browse source
This commit is contained in:
Connor McLaughlin 2022-08-10 13:09:48 +10:00
parent 54c2447ff3
commit c3da236f92
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/core/system.cpp
View file

@ -862,8 +862,13 @@ bool System::UpdateGameSettingsLayer()
} }
std::string input_profile_name; std::string input_profile_name;
bool use_game_settings_for_controller = false;
if (new_interface) if (new_interface)
new_interface->GetStringValue("ControllerPorts", "InputProfileName", &input_profile_name); {
new_interface->GetBoolValue("ControllerPorts", "UseGameSettingsForController", &use_game_settings_for_controller);
if (!use_game_settings_for_controller)
new_interface->GetStringValue("ControllerPorts", "InputProfileName", &input_profile_name);
}
if (!s_game_settings_interface && !new_interface && s_input_profile_name == input_profile_name) if (!s_game_settings_interface && !new_interface && s_input_profile_name == input_profile_name)
return false; return false;
@ -872,31 +877,39 @@ bool System::UpdateGameSettingsLayer()
s_game_settings_interface = std::move(new_interface); s_game_settings_interface = std::move(new_interface);
std::unique_ptr<INISettingsInterface> input_interface; std::unique_ptr<INISettingsInterface> input_interface;
if (!input_profile_name.empty()) if (!use_game_settings_for_controller)
{ {
const std::string filename(GetInputProfilePath(input_profile_name)); if (!input_profile_name.empty())
if (FileSystem::FileExists(filename.c_str()))
{ {
Log_InfoPrintf("Loading input profile from '%s'...", filename.c_str()); const std::string filename(GetInputProfilePath(input_profile_name));
input_interface = std::make_unique<INISettingsInterface>(std::move(filename)); if (FileSystem::FileExists(filename.c_str()))
if (!input_interface->Load())
{ {
Log_ErrorPrintf("Failed to parse input profile ini '%s'", input_interface->GetFileName().c_str()); Log_InfoPrintf("Loading input profile from '%s'...", filename.c_str());
input_interface.reset(); input_interface = std::make_unique<INISettingsInterface>(std::move(filename));
if (!input_interface->Load())
{
Log_ErrorPrintf("Failed to parse input profile ini '%s'", input_interface->GetFileName().c_str());
input_interface.reset();
input_profile_name = {};
}
}
else
{
Log_InfoPrintf("No input profile found (tried '%s')", filename.c_str());
input_profile_name = {}; input_profile_name = {};
} }
} }
else
{ Host::Internal::SetInputSettingsLayer(input_interface.get());
Log_InfoPrintf("No input profile found (tried '%s')", filename.c_str()); }
input_profile_name = {}; else
} {
// using game settings for bindings too
Host::Internal::SetInputSettingsLayer(s_game_settings_interface.get());
} }
Host::Internal::SetInputSettingsLayer(input_interface.get());
s_input_settings_interface = std::move(input_interface); s_input_settings_interface = std::move(input_interface);
s_input_profile_name = std::move(input_profile_name); s_input_profile_name = std::move(input_profile_name);
return true; return true;
} }