From 2bcf70af3f4b80870d93b17c367c9822a6ba4f41 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 4 Feb 2024 15:29:36 +0100 Subject: InputCommon: Refactor away InputConfig::LoadConfig's switch case By having getters for this information, other code that needs access to the same information can call the getters instead of duplicating the information. --- Source/Core/InputCommon/InputConfig.cpp | 64 ++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 24 deletions(-) (limited to 'Source/Core/InputCommon/InputConfig.cpp') diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index f372fa3c1f..0acd67c392 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -20,57 +20,40 @@ #include "InputCommon/InputProfile.h" InputConfig::InputConfig(const std::string& ini_name, const std::string& gui_name, - const std::string& profile_name) - : m_ini_name(ini_name), m_gui_name(gui_name), m_profile_name(profile_name) + const std::string& profile_name, InputClass input_class) + : m_ini_name(ini_name), m_gui_name(gui_name), m_profile_name(profile_name), + m_input_class(input_class) { } InputConfig::~InputConfig() = default; -bool InputConfig::LoadConfig(InputClass type) +bool InputConfig::LoadConfig() { Common::IniFile inifile; bool useProfile[MAX_BBMOTES] = {false, false, false, false, false}; static constexpr std::array num = {"1", "2", "3", "4", "BB"}; std::string profile[MAX_BBMOTES]; - std::string path; m_dynamic_input_tex_config_manager.Load(); if (SConfig::GetInstance().GetGameID() != "00000000") { - std::string type_str; - switch (type) - { - case InputClass::GBA: - type_str = "GBA"; - path = "Profiles/GBA/"; - break; - case InputClass::Wii: - type_str = "Wiimote"; - path = "Profiles/Wiimote/"; - break; - case InputClass::GC: - default: - type_str = "Pad"; - path = "Profiles/GCPad/"; - break; - } + const std::string profile_directory = GetProfileDirectoryPath(); Common::IniFile game_ini = SConfig::GetInstance().LoadGameIni(); auto* control_section = game_ini.GetOrCreateSection("Controls"); for (int i = 0; i < 4; i++) { - const auto profile_name = fmt::format("{}Profile{}", type_str, num[i]); + const auto profile_name = fmt::format("{}Profile{}", GetProfileKey(), num[i]); if (control_section->Exists(profile_name)) { std::string profile_setting; if (control_section->Get(profile_name, &profile_setting)) { - auto profiles = InputProfile::GetProfilesFromSetting( - profile_setting, File::GetUserPath(D_CONFIG_IDX) + path); + auto profiles = InputProfile::GetProfilesFromSetting(profile_setting, profile_directory); if (profiles.empty()) { @@ -176,6 +159,39 @@ bool InputConfig::ControllersNeedToBeCreated() const return m_controllers.empty(); } +std::string InputConfig::GetProfileKey() const +{ + switch (m_input_class) + { + case InputClass::GBA: + return "GBA"; + case InputClass::Wii: + return "Wiimote"; + case InputClass::GC: + default: + return "Pad"; + } +} + +std::string InputConfig::GetProfileDirectoryName() const +{ + switch (m_input_class) + { + case InputClass::GBA: + return "GBA"; + case InputClass::Wii: + return "Wiimote"; + case InputClass::GC: + default: + return "GCPad"; + } +} + +std::string InputConfig::GetProfileDirectoryPath() const +{ + return fmt::format("{}Profiles/{}/", File::GetUserPath(D_CONFIG_IDX), GetProfileDirectoryName()); +} + int InputConfig::GetControllerCount() const { return static_cast(m_controllers.size()); -- cgit v1.2.3 From 6cf55ab1ee13e62b272642ae4f1fadcc792b5e28 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 4 Feb 2024 16:31:15 +0100 Subject: InputCommon: Unify GetProfileName and GetProfileDirectoryName After reading the previous commit, you might think "hold on, what's the difference between GetProfileName and GetProfileDirectoryName"? These two are being used for the exact same thing - figuring out where profiles are stored - yet they return different values for certain controllers like GC keyboards! As far as I can tell, the existing code has been broken for GC keyboards since they were introduced a decade ago. The GUI (and more recently, also InputCycler) would write and read profiles in one location, and our code for loading profiles specified in a game INI file would read profiles in another location. This commit gets rid of the set of values used by the game INI code in favor of the other set. This does breaking existing setups where a GCKey profile has been configured in a game INI, but I think the number of working such setups is vanishingly small. The alternative would make existing GCKey profiles go missing from the profile dropdown in the GUI, which I think would be more disruptive. The alternative would also force new GCKey profiles into the same directory as GCPad profiles. This commit also fixes a regression from d6c0f8e749. The Android GUI was using GetProfileName to figure out what key to use in the game INI, which made it use incorrect game INI entries for GameCube controller profiles but not Wii Remote profiles. Now the Android GUI uses GetProfileKey for this, fixing the problem. --- Source/Core/InputCommon/InputConfig.cpp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'Source/Core/InputCommon/InputConfig.cpp') diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 0acd67c392..651e2821c2 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -20,8 +20,8 @@ #include "InputCommon/InputProfile.h" InputConfig::InputConfig(const std::string& ini_name, const std::string& gui_name, - const std::string& profile_name, InputClass input_class) - : m_ini_name(ini_name), m_gui_name(gui_name), m_profile_name(profile_name), + const std::string& profile_directory_name, InputClass input_class) + : m_ini_name(ini_name), m_gui_name(gui_name), m_profile_directory_name(profile_directory_name), m_input_class(input_class) { } @@ -39,7 +39,7 @@ bool InputConfig::LoadConfig() if (SConfig::GetInstance().GetGameID() != "00000000") { - const std::string profile_directory = GetProfileDirectoryPath(); + const std::string profile_directory = GetUserProfileDirectoryPath(); Common::IniFile game_ini = SConfig::GetInstance().LoadGameIni(); auto* control_section = game_ini.GetOrCreateSection("Controls"); @@ -173,23 +173,14 @@ std::string InputConfig::GetProfileKey() const } } -std::string InputConfig::GetProfileDirectoryName() const +std::string InputConfig::GetUserProfileDirectoryPath() const { - switch (m_input_class) - { - case InputClass::GBA: - return "GBA"; - case InputClass::Wii: - return "Wiimote"; - case InputClass::GC: - default: - return "GCPad"; - } + return fmt::format("{}Profiles/{}/", File::GetUserPath(D_CONFIG_IDX), GetProfileDirectoryName()); } -std::string InputConfig::GetProfileDirectoryPath() const +std::string InputConfig::GetSysProfileDirectoryPath() const { - return fmt::format("{}Profiles/{}/", File::GetUserPath(D_CONFIG_IDX), GetProfileDirectoryName()); + return fmt::format("{}Profiles/{}/", File::GetSysDirectory(), GetProfileDirectoryName()); } int InputConfig::GetControllerCount() const -- cgit v1.2.3 From 1315b54ffaa2833ddda7e543945c88ed5396efd6 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 4 Feb 2024 17:36:15 +0100 Subject: InputCommon: Use distinct values for profile key Because the last commit made us use separate folders for GCPad and GCKey profiles, we should also use separate game INI keys for them. Otherwise setting e.g. PadProfile1 in a game INI will make both GCPad and GCKey try to load it, typically with one of them succeeding and the other one showing a panic alert due to the profile not existing in its folder. Better do this breaking change for GCKeys in the same PR as the other breaking change rather than later. --- Source/Core/InputCommon/InputConfig.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'Source/Core/InputCommon/InputConfig.cpp') diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp index 651e2821c2..ff3f68acd0 100644 --- a/Source/Core/InputCommon/InputConfig.cpp +++ b/Source/Core/InputCommon/InputConfig.cpp @@ -20,9 +20,9 @@ #include "InputCommon/InputProfile.h" InputConfig::InputConfig(const std::string& ini_name, const std::string& gui_name, - const std::string& profile_directory_name, InputClass input_class) + const std::string& profile_directory_name, const std::string& profile_key) : m_ini_name(ini_name), m_gui_name(gui_name), m_profile_directory_name(profile_directory_name), - m_input_class(input_class) + m_profile_key(profile_key) { } @@ -159,20 +159,6 @@ bool InputConfig::ControllersNeedToBeCreated() const return m_controllers.empty(); } -std::string InputConfig::GetProfileKey() const -{ - switch (m_input_class) - { - case InputClass::GBA: - return "GBA"; - case InputClass::Wii: - return "Wiimote"; - case InputClass::GC: - default: - return "Pad"; - } -} - std::string InputConfig::GetUserProfileDirectoryPath() const { return fmt::format("{}Profiles/{}/", File::GetUserPath(D_CONFIG_IDX), GetProfileDirectoryName()); -- cgit v1.2.3