diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-08-16 19:17:07 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-08-16 19:17:07 +1200 |
| commit | 9de7611ff940d24551bc77a5e29b86911e3fa749 (patch) | |
| tree | 7615ec4cfd3aaba63d96ef1cb3cc33fd0efa516a /Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h | |
| parent | 417552b21e30aee3dc2b720d65c2cd757997a33e (diff) | |
| parent | bff2bc1288fa4309e1b2aef1486845ba01311100 (diff) | |
Merge branch 'master' into wii-network
Conflicts:
CMakeLists.txt
Source/Core/Core/Core.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
Source/Dolphin_2010.sln
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h | 17 |
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: |