aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Brown <themagnificentmrb@gmail.com>2018-01-04 13:08:59 -0800
committerGarrett Brown <themagnificentmrb@gmail.com>2018-01-15 14:36:31 -0800
commit090939ab1cf61c86cd60db33f9e81d104e34ef07 (patch)
tree8d777e02361cdec0559b7eb62b9eed2996e590cb
parent448601ad4c28d6e87c15f2a4b9248e114f1eb8ea (diff)
Controllers: Fix missing "paddles" category
-rw-r--r--xbmc/games/controllers/ControllerDefinitions.h1
-rw-r--r--xbmc/games/controllers/ControllerTranslator.cpp2
-rw-r--r--xbmc/input/joysticks/JoystickTypes.h1
3 files changed, 4 insertions, 0 deletions
diff --git a/xbmc/games/controllers/ControllerDefinitions.h b/xbmc/games/controllers/ControllerDefinitions.h
index d06ae45ba1..244fdc09cf 100644
--- a/xbmc/games/controllers/ControllerDefinitions.h
+++ b/xbmc/games/controllers/ControllerDefinitions.h
@@ -53,3 +53,4 @@
#define FEATURE_CATEGORY_HARDWARE "hardware"
#define FEATURE_CATEGORY_WHEEL "wheel"
#define FEATURE_CATEGORY_JOYSTICK "joysticks"
+#define FEATURE_CATEGORY_PADDLE "paddles"
diff --git a/xbmc/games/controllers/ControllerTranslator.cpp b/xbmc/games/controllers/ControllerTranslator.cpp
index 334e4f306a..75d119720e 100644
--- a/xbmc/games/controllers/ControllerTranslator.cpp
+++ b/xbmc/games/controllers/ControllerTranslator.cpp
@@ -76,6 +76,7 @@ const char* CControllerTranslator::TranslateFeatureCategory(FEATURE_CATEGORY cat
case FEATURE_CATEGORY::HARDWARE: return FEATURE_CATEGORY_HARDWARE;
case FEATURE_CATEGORY::WHEEL: return FEATURE_CATEGORY_WHEEL;
case FEATURE_CATEGORY::JOYSTICK: return FEATURE_CATEGORY_JOYSTICK;
+ case FEATURE_CATEGORY::PADDLE: return FEATURE_CATEGORY_PADDLE;
default:
break;
}
@@ -99,6 +100,7 @@ FEATURE_CATEGORY CControllerTranslator::TranslateFeatureCategory(const std::stri
if (strCategory == FEATURE_CATEGORY_HARDWARE) return FEATURE_CATEGORY::HARDWARE;
if (strCategory == FEATURE_CATEGORY_WHEEL) return FEATURE_CATEGORY::WHEEL;
if (strCategory == FEATURE_CATEGORY_JOYSTICK) return FEATURE_CATEGORY::JOYSTICK;
+ if (strCategory == FEATURE_CATEGORY_PADDLE) return FEATURE_CATEGORY::PADDLE;
return FEATURE_CATEGORY::UNKNOWN;
}
diff --git a/xbmc/input/joysticks/JoystickTypes.h b/xbmc/input/joysticks/JoystickTypes.h
index 4b10da5982..6690a6b278 100644
--- a/xbmc/input/joysticks/JoystickTypes.h
+++ b/xbmc/input/joysticks/JoystickTypes.h
@@ -88,6 +88,7 @@ namespace JOYSTICK
HARDWARE, // A button or functionality on the console
WHEEL,
JOYSTICK,
+ PADDLE,
};
/*!