diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-11-13 00:53:24 -0800 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-11-28 10:50:45 -0800 |
| commit | 367a42dcfdf61e5fcd3e3444190ed25d4d8fc114 (patch) | |
| tree | a7ec9ee4e808582d835bddd0cfc104c58a82c831 /Source/Core/InputCommon/ControllerInterface/OSX | |
| parent | 0c056c64118673ece8fefcc22fa64b78c5431ab6 (diff) | |
ControllerInterface: Implement dummy UpdateInput / UpdateOutputs
Make the implementation here a bit easier.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/OSX')
4 files changed, 1 insertions, 14 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h index ffbe475840..728d55dde8 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h @@ -72,8 +72,6 @@ private: }; public: - bool UpdateInput(); - Joystick(IOHIDDeviceRef device, std::string name, int index); ~Joystick(); diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm index 93dea13c28..bdba40c410 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm @@ -90,11 +90,6 @@ Joystick::~Joystick() m_ff_device->Release(); } -bool Joystick::UpdateInput() -{ - return true; -} - std::string Joystick::GetName() const { return m_device_name; diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h index 36705075ee..c38235c2b8 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.h @@ -53,8 +53,7 @@ private: }; public: - bool UpdateInput(); - bool UpdateOutput(); + bool UpdateInput() override; Keyboard(IOHIDDeviceRef device, std::string name, int index, void *window); diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm index 1294346e1b..5a97b27488 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm @@ -89,11 +89,6 @@ bool Keyboard::UpdateInput() return true; } -bool Keyboard::UpdateOutput() -{ - return true; -} - std::string Keyboard::GetName() const { return m_device_name; |
