summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/Android/Android.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Android/Android.h')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Android/Android.h63
1 files changed, 33 insertions, 30 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
index c108a86067..53b578f699 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h
@@ -11,43 +11,46 @@ namespace ciface
{
namespace Android
{
-
-void Init( std::vector<Core::Device*>& devices );
+void Init(std::vector<Core::Device*>& devices);
class Touchscreen : public Core::Device
{
private:
- class Button : public Input
- {
- public:
- std::string GetName() const;
- Button(int padID, ButtonManager::ButtonType index) : _padID(padID), _index(index) {}
- ControlState GetState() const;
- private:
- const int _padID;
- const ButtonManager::ButtonType _index;
- };
- class Axis : public Input
- {
- public:
- std::string GetName() const;
- Axis(int padID, ButtonManager::ButtonType index, float neg = 1.0f) : _padID(padID), _index(index), _neg(neg) {}
- ControlState GetState() const;
- private:
- const int _padID;
- const ButtonManager::ButtonType _index;
- const float _neg;
- };
+ class Button : public Input
+ {
+ public:
+ std::string GetName() const;
+ Button(int padID, ButtonManager::ButtonType index) : _padID(padID), _index(index) {}
+ ControlState GetState() const;
+
+ private:
+ const int _padID;
+ const ButtonManager::ButtonType _index;
+ };
+ class Axis : public Input
+ {
+ public:
+ std::string GetName() const;
+ Axis(int padID, ButtonManager::ButtonType index, float neg = 1.0f)
+ : _padID(padID), _index(index), _neg(neg)
+ {
+ }
+ ControlState GetState() const;
+
+ private:
+ const int _padID;
+ const ButtonManager::ButtonType _index;
+ const float _neg;
+ };
public:
- Touchscreen(int padID);
- ~Touchscreen() {}
+ Touchscreen(int padID);
+ ~Touchscreen() {}
+ std::string GetName() const;
+ int GetId() const;
+ std::string GetSource() const;
- std::string GetName() const;
- int GetId() const;
- std::string GetSource() const;
private:
- const int _padID;
+ const int _padID;
};
-
}
}