Merge pull request #8729 from JosJuice/android-touch-ir-default

Android: Use touch emulation of IR by default

1 files changed, 7 insertions, 6 deletions

diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h
index 3099a40a0a..8f98401dcd 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h
@@ -49,16 +49,17 @@ enum class GroupType
 class ControlGroup
 {
 public:
-  enum class CanBeDisabled
+  enum class DefaultValue
   {
-    No,
-    Yes,
+    AlwaysEnabled,
+    Enabled,
+    Disabled,
   };
 
   explicit ControlGroup(std::string name, GroupType type = GroupType::Other,
-                        CanBeDisabled can_be_disabled = CanBeDisabled::No);
+                        DefaultValue default_value = DefaultValue::AlwaysEnabled);
   ControlGroup(std::string name, std::string ui_name, GroupType type = GroupType::Other,
-               CanBeDisabled can_be_disabled = CanBeDisabled::No);
+               DefaultValue default_value = DefaultValue::AlwaysEnabled);
   virtual ~ControlGroup();
 
   virtual void LoadConfig(IniFile::Section* sec, const std::string& defdev = "",
@@ -92,7 +93,7 @@ public:
   const std::string name;
   const std::string ui_name;
   const GroupType type;
-  const bool can_be_disabled;
+  const DefaultValue default_value;
 
   bool enabled = true;
   std::vector<std::unique_ptr<Control>> controls;