From 099d406ed9be8c8ba0bc969251e0eed788810286 Mon Sep 17 00:00:00 2001
From: montellese <montellese@kodi.tv>
Date: Wed, 3 Feb 2016 00:09:10 +0100
Subject: [PATCH] Fix build on windows

---
 src/api/Joystick.h                         |  5 +++
 src/api/xinput/JoystickInterfaceXInput.cpp | 38 ----------------------
 src/api/xinput/JoystickInterfaceXInput.h   |  4 ---
 src/api/xinput/JoystickXInput.cpp          |  2 --
 4 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/src/api/Joystick.h b/src/api/Joystick.h
index fdd10fdd..19c76bcb 100644
--- a/src/api/Joystick.h
+++ b/src/api/Joystick.h
@@ -80,6 +80,11 @@ namespace JOYSTICK
      */
     virtual bool GetEvents(std::vector<ADDON::PeripheralEvent>& events);
 
+    /*!
+     * Tries to power off the joystick.
+     */
+    virtual void PowerOff() { }
+
   protected:
     /*!
      * Implemented by derived class to scan for events
diff --git a/src/api/xinput/JoystickInterfaceXInput.cpp b/src/api/xinput/JoystickInterfaceXInput.cpp
index 7fc7ee35..73886f84 100644
--- a/src/api/xinput/JoystickInterfaceXInput.cpp
+++ b/src/api/xinput/JoystickInterfaceXInput.cpp
@@ -23,37 +23,12 @@
 #include "XInputDLL.h"
 #include "api/JoystickTypes.h"
 
-#include <array>
 #include <Xinput.h>
 
 using namespace JOYSTICK;
 
 #define MAX_JOYSTICKS 4
 
-// --- DefaultFeatures ---------------------------------------------------------
-
-namespace JOYSTICK
-{
-  struct FeatureStruct
-  {
-    const char*           controllerId;
-    const char*           name;
-    JOYSTICK_FEATURE_TYPE type;
-    unsigned int          driverIndex;
-  };
-
-  std::array<FeatureStruct, 4> DefaultFeatures = {
-    {
-      { "game.controller.default", "leftmotor",   JOYSTICK_FEATURE_TYPE_MOTOR, MOTOR_LEFT },
-      { "game.controller.default", "rightmotor",  JOYSTICK_FEATURE_TYPE_MOTOR, MOTOR_RIGHT },
-      { "game.controller.ps",      "strongmotor", JOYSTICK_FEATURE_TYPE_MOTOR, MOTOR_LEFT },
-      { "game.controller.ps",      "weakmotor",   JOYSTICK_FEATURE_TYPE_MOTOR, MOTOR_RIGHT },
-    }
-  };
-}
-
-// --- CJoystickInterfaceXInput ------------------------------------------------
-
 const char* CJoystickInterfaceXInput::Name(void) const
 {
   return INTERFACE_XINPUT;
@@ -83,16 +58,3 @@ bool CJoystickInterfaceXInput::ScanForJoysticks(JoystickVector& joysticks)
 
   return true;
 }
-
-void CJoystickInterfaceXInput::GetFeatures(const std::string& controllerId, FeatureVector& features)
-{
-  for (auto& featureStruct : DefaultFeatures)
-  {
-    if (controllerId == featureStruct.controllerId)
-    {
-      ADDON::JoystickFeature feature(featureStruct.name, featureStruct.type);
-      feature.SetPrimitive(ADDON::DriverPrimitive::CreateMotor(featureStruct.driverIndex));
-      features.push_back(std::move(feature));
-    }
-  }
-}
diff --git a/src/api/xinput/JoystickInterfaceXInput.h b/src/api/xinput/JoystickInterfaceXInput.h
index 774e815f..01d852b1 100644
--- a/src/api/xinput/JoystickInterfaceXInput.h
+++ b/src/api/xinput/JoystickInterfaceXInput.h
@@ -21,9 +21,6 @@
 
 #include "api/IJoystickInterface.h"
 
-#define MOTOR_LEFT    0
-#define MOTOR_RIGHT   1
-
 namespace JOYSTICK
 {
   class CJoystickInterfaceXInput : public IJoystickInterface
@@ -37,6 +34,5 @@ namespace JOYSTICK
     virtual bool Initialize(void) override;
     virtual void Deinitialize(void) override;
     virtual bool ScanForJoysticks(JoystickVector& joysticks) override;
-    virtual void GetFeatures(const std::string& controllerId, FeatureVector& features) override;
   };
 }
diff --git a/src/api/xinput/JoystickXInput.cpp b/src/api/xinput/JoystickXInput.cpp
index 92e6d6f8..dc7ceb45 100644
--- a/src/api/xinput/JoystickXInput.cpp
+++ b/src/api/xinput/JoystickXInput.cpp
@@ -44,8 +44,6 @@ CJoystickXInput::CJoystickXInput(unsigned int controllerID)
   SetButtonCount(BUTTON_COUNT);
   SetHatCount(HAT_COUNT);
   SetAxisCount(AXIS_COUNT);
- 
-  SetSupportsPowerOff(true);
 }
 
 bool CJoystickXInput::Equals(const CJoystick* rhs) const