System: Preparations for per-game controller settings

src/core/system.cpp

@@ -862,8 +862,13 @@ bool System::UpdateGameSettingsLayer()
   }
 
   std::string input_profile_name;
+  bool use_game_settings_for_controller = false;
   if (new_interface)
+  {
+    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)
     return false;
@@ -872,6 +877,8 @@ bool System::UpdateGameSettingsLayer()
   s_game_settings_interface = std::move(new_interface);
 
   std::unique_ptr<INISettingsInterface> input_interface;
+  if (!use_game_settings_for_controller)
+  {
     if (!input_profile_name.empty())
     {
       const std::string filename(GetInputProfilePath(input_profile_name));
@@ -894,9 +901,15 @@ bool System::UpdateGameSettingsLayer()
     }
 
     Host::Internal::SetInputSettingsLayer(input_interface.get());
+  }
+  else
+  {
+    // using game settings for bindings too
+    Host::Internal::SetInputSettingsLayer(s_game_settings_interface.get());
+  }
+
   s_input_settings_interface = std::move(input_interface);
   s_input_profile_name = std::move(input_profile_name);
-
   return true;
 }