diff options
| author | bunnei <bunneidev@gmail.com> | 2017-03-17 14:59:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 14:59:39 -0400 |
| commit | 423ab5e2bcf5a522e5f412447c05f648df57a14c (patch) | |
| tree | 1e60eaeffa59229254a47f885d2fe2cbbdc1a5c0 /src/citra/emu_window/emu_window_sdl2.h | |
| parent | 3e7459bbf9efa80b2d2dd45b892f7f3cef8ab751 (diff) | |
| parent | b5faa681206e2d82248293591f010f7aea8b99fe (diff) | |
Merge pull request #2497 from wwylele/input-2
Refactor input emulation & add SDL gamepad support
Diffstat (limited to 'src/citra/emu_window/emu_window_sdl2.h')
| -rw-r--r-- | src/citra/emu_window/emu_window_sdl2.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/citra/emu_window/emu_window_sdl2.h index b1cbf16d7..1ce2991f7 100644 --- a/src/citra/emu_window/emu_window_sdl2.h +++ b/src/citra/emu_window/emu_window_sdl2.h @@ -31,9 +31,6 @@ public: /// Whether the window is still open, and a close request hasn't yet been sent bool IsOpen() const; - /// Load keymap from configuration - void ReloadSetKeymaps() override; - private: /// Called by PollEvents when a key is pressed or released. void OnKeyEvent(int key, u8 state); @@ -61,9 +58,6 @@ private: /// The OpenGL context associated with the window SDL_GLContext gl_context; - /// Device id of keyboard for use with KeyMap - int keyboard_id; - /// Motion sensors emulation std::unique_ptr<Motion::MotionEmu> motion_emu; }; |