summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h')
-rw-r--r--Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
index 9bdb52a61d..e38c6a221a 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
@@ -17,7 +17,7 @@
#ifndef _CIFACE_ANDROID_H_
#define _CIFACE_ANDROID_H_
-#include "../ControllerInterface.h"
+#include "../Device.h"
#include "Android/ButtonManager.h"
namespace ciface
@@ -25,8 +25,8 @@ namespace ciface
namespace Android
{
-void Init( std::vector<ControllerInterface::Device*>& devices );
-class Touchscreen : public ControllerInterface::Device
+void Init( std::vector<Core::Device*>& devices );
+class Touchscreen : public Core::Device
{
private:
class Button : public Input
@@ -36,7 +36,16 @@ private:
Button(ButtonManager::ButtonType index) : m_index(index) {}
ControlState GetState() const;
private:
- const ButtonManager::ButtonType m_index;
+ const ButtonManager::ButtonType m_index;
+ };
+ class Axis : public Input
+ {
+ public:
+ std::string GetName() const;
+ Axis(ButtonManager::ButtonType index) : m_index(index) {}
+ ControlState GetState() const;
+ private:
+ const ButtonManager::ButtonType m_index;
};
public: