diff options
author | Kevin Hartman <kevin@hart.mn> | 2014-09-08 21:46:02 -0700 |
---|---|---|
committer | Kevin Hartman <kevin@hart.mn> | 2014-09-12 01:15:14 -0700 |
commit | 02fd19b2f60f4db8a683734e4300d7498c861309 (patch) | |
tree | c9c95671835d73b5ca7e52029de5bb27832e11a3 /src/common/emu_window.h | |
parent | 4a94ec934ab1a2216f94e3fcc46f5dde1d6e2f02 (diff) |
Added support for multiple input device types for KeyMap and connected Qt.
Diffstat (limited to 'src/common/emu_window.h')
-rw-r--r-- | src/common/emu_window.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/common/emu_window.h b/src/common/emu_window.h index 90fbd933..23f178fd 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h @@ -8,7 +8,6 @@ #include "common/scm_rev.h" #include "common/key_map.h" -#include "core/hle/service/hid.h" // Abstraction class used to provide an interface between emulation code and the frontend (e.g. SDL, // QGLWidget, GLFW, etc...) @@ -35,21 +34,11 @@ public: /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread virtual void DoneCurrent() = 0; - static void KeyPressed(KeyMap::CitraKey key) { - HID_User::PADState mapped_key = KeyMap::Get3DSKey(key); + /// Signals a key press action to the HID module + static void KeyPressed(KeyMap::HostDeviceKey key); - if (mapped_key.hex != HID_User::PAD_NONE.hex) { - HID_User::PADButtonPress(mapped_key); - } - } - - static void KeyReleased(KeyMap::CitraKey key) { - HID_User::PADState mapped_key = KeyMap::Get3DSKey(key); - - if (mapped_key.hex != HID_User::PAD_NONE.hex) { - HID_User::PADButtonRelease(mapped_key); - } - } + /// Signals a key release action to the HID module + static void KeyReleased(KeyMap::HostDeviceKey key); Config GetConfig() const { return m_config; |