diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-16 20:07:10 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-06-25 00:58:30 -0400 |
| commit | 877106b027431c6edb2d2c702fa6d811dac3d250 (patch) | |
| tree | a0d83be190efea7ad4915db7db9ac40f9192b251 /Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp | |
| parent | 143d2eccb49b700ccd00dfa229b03d1d1a51533c (diff) | |
InputCommon: Split Device stuff out
The ExpressionParser needs this to be out of here to prevent issues
with cyclic references.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp index ea6452376d..850ff27281 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp @@ -1,6 +1,3 @@ -#include "../ControllerInterface.h" - -#ifdef CIFACE_USE_DINPUT_KBM #include "DInputKeyboardMouse.h" #include "DInput.h" @@ -42,7 +39,7 @@ static const struct // lil silly static HWND hwnd; -void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices, HWND _hwnd) +void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND _hwnd) { hwnd = _hwnd; @@ -252,16 +249,6 @@ std::string KeyboardMouse::GetSource() const return DINPUT_SOURCE_NAME; } -//ControlState KeyboardMouse::GetInputState(const ControllerInterface::Device::Input* const input) const -//{ -// return (((Input*)input)->GetState(&m_state_in)); -//} -// -//void KeyboardMouse::SetOutputState(const ControllerInterface::Device::Output* const output, const ControlState state) -//{ -// ((Output*)output)->SetState(state, m_state_out); -//} - // names std::string KeyboardMouse::Key::GetName() const { @@ -322,5 +309,3 @@ void KeyboardMouse::Light::SetState(const ControlState state) } } - -#endif |